Move //chrome/browser/{chromeos => ash}/web_applications

This CL is part of the Chrome OS source code directory migration: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE. Change-Id: I76fc68f3ac727d38589ebd97c76c82c678e4571d Bug: 1164001 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2717247 Reviewed-by: Hidehiko Abe <hidehiko@chromium.org> Owners-Override: Hidehiko Abe <hidehiko@chromium.org> Commit-Queue: Yeunjoo Choi <ychoi@igalia.com> Cr-Commit-Position: refs/heads/master@{#858074}
marcosholgado · Feb 26, 2021 · 0a8a841 · 0a8a841
1 parent c33116f
commit 0a8a841
Show file tree

Hide file tree

Showing 72 changed files with 212 additions and 212 deletions.
diff --git a/WATCHLISTS b/WATCHLISTS
@@ -785,7 +785,7 @@
     },
     'chromeos_media_app': {
       'filepath': 'chromeos/components/media_app_ui/|'\
-                  'chrome/browser/chromeos/web_applications/',
+                  'chrome/browser/ash/web_applications/',
     },
     'chromeos_net': {
       'filepath': 'ash/system/network/|'\

diff --git a/...me/browser/chromeos/web_applications/DEPS → chrome/browser/ash/web_applications/DEPS b/...me/browser/chromeos/web_applications/DEPS → chrome/browser/ash/web_applications/DEPS
diff --git a/...er/chromeos/web_applications/DIR_METADATA → ...browser/ash/web_applications/DIR_METADATA b/...er/chromeos/web_applications/DIR_METADATA → ...browser/ash/web_applications/DIR_METADATA
diff --git a/.../browser/chromeos/web_applications/OWNERS → chrome/browser/ash/web_applications/OWNERS b/.../browser/chromeos/web_applications/OWNERS → chrome/browser/ash/web_applications/OWNERS
diff --git a/...ons/camera_app_integration_browsertest.cc → ...ons/camera_app_integration_browsertest.cc b/...ons/camera_app_integration_browsertest.cc → ...ons/camera_app_integration_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include "ash/constants/ash_features.h"
 #include "base/test/scoped_feature_list.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_integration_test.h"
+#include "chrome/browser/ash/web_applications/system_web_app_integration_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"

diff --git a/...pplications/camera_system_web_app_info.cc → ...pplications/camera_system_web_app_info.cc b/...pplications/camera_system_web_app_info.cc → ...pplications/camera_system_web_app_info.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/camera_system_web_app_info.h"
+#include "chrome/browser/ash/web_applications/camera_system_web_app_info.h"
 
-#include "chrome/browser/chromeos/web_applications/system_web_app_install_utils.h"
+#include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chromeos/components/camera_app_ui/resources/strings/grit/chromeos_camera_app_strings.h"

diff --git a/...applications/camera_system_web_app_info.h → ...applications/camera_system_web_app_info.h b/...applications/camera_system_web_app_info.h → ...applications/camera_system_web_app_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CAMERA_SYSTEM_WEB_APP_INFO_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CAMERA_SYSTEM_WEB_APP_INFO_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CAMERA_SYSTEM_WEB_APP_INFO_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CAMERA_SYSTEM_WEB_APP_INFO_H_
 
 #include <memory>
 
@@ -12,4 +12,4 @@ struct WebApplicationInfo;
 // Return a WebApplicationInfo used to install the app.
 std::unique_ptr<WebApplicationInfo> CreateWebAppInfoForCameraSystemWebApp();
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CAMERA_SYSTEM_WEB_APP_INFO_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CAMERA_SYSTEM_WEB_APP_INFO_H_
diff --git a/...ications/chrome_camera_app_ui_constants.h → ...ications/chrome_camera_app_ui_constants.h b/...ications/chrome_camera_app_ui_constants.h → ...ications/chrome_camera_app_ui_constants.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_CONSTANTS_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_CONSTANTS_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_CONSTANTS_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_CONSTANTS_H_
 
 // All window size number here are referred to inner size excluding top bar.
 constexpr int kChromeCameraAppDefaultWidth = 764;
 constexpr int kChromeCameraAppDefaultHeight = 412;
 constexpr int kChromeCameraAppMinimumWidth = 486;
 constexpr int kChromeCameraAppMinimumHeight = 412;
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_CONSTANTS_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_CONSTANTS_H_
diff --git a/...ications/chrome_camera_app_ui_delegate.cc → ...ications/chrome_camera_app_ui_delegate.cc b/...ications/chrome_camera_app_ui_delegate.cc → ...ications/chrome_camera_app_ui_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/chrome_camera_app_ui_delegate.h"
+#include "chrome/browser/ash/web_applications/chrome_camera_app_ui_delegate.h"
 
 #include <vector>
 
@@ -15,7 +15,7 @@
 #include "chrome/browser/apps/app_service/launch_utils.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 // TODO(b/174811949): Hide behind ChromeOS build flag.
-#include "chrome/browser/chromeos/web_applications/chrome_camera_app_ui_constants.h"
+#include "chrome/browser/ash/web_applications/chrome_camera_app_ui_constants.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"

diff --git a/...lications/chrome_camera_app_ui_delegate.h → ...lications/chrome_camera_app_ui_delegate.h b/...lications/chrome_camera_app_ui_delegate.h → ...lications/chrome_camera_app_ui_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_DELEGATE_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_DELEGATE_H_
 
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
 #include "chromeos/components/camera_app_ui/camera_app_ui_delegate.h"
@@ -82,4 +82,4 @@ class ChromeCameraAppUIDelegate : public CameraAppUIDelegate {
   content::WebUI* web_ui_;  // Owns |this|.
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_CAMERA_APP_UI_DELEGATE_H_
diff --git a/...ations/chrome_file_manager_ui_delegate.cc → ...ations/chrome_file_manager_ui_delegate.cc b/...ations/chrome_file_manager_ui_delegate.cc → ...ations/chrome_file_manager_ui_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/chrome_file_manager_ui_delegate.h"
+#include "chrome/browser/ash/web_applications/chrome_file_manager_ui_delegate.h"
 
 #include <memory.h>
 

diff --git a/...cations/chrome_file_manager_ui_delegate.h → ...cations/chrome_file_manager_ui_delegate.h b/...cations/chrome_file_manager_ui_delegate.h → ...cations/chrome_file_manager_ui_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_FILE_MANAGER_UI_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_FILE_MANAGER_UI_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_FILE_MANAGER_UI_DELEGATE_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_FILE_MANAGER_UI_DELEGATE_H_
 
 #include "chromeos/components/file_manager/file_manager_ui_delegate.h"
 
@@ -27,4 +27,4 @@ class ChromeFileManagerUIDelegate : public FileManagerUIDelegate {
   content::WebUI* web_ui_;  // Owns |this|.
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_FILE_MANAGER_UI_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_FILE_MANAGER_UI_DELEGATE_H_
diff --git a/...plications/chrome_help_app_ui_delegate.cc → ...plications/chrome_help_app_ui_delegate.cc b/...plications/chrome_help_app_ui_delegate.cc → ...plications/chrome_help_app_ui_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/chrome_help_app_ui_delegate.h"
+#include "chrome/browser/ash/web_applications/chrome_help_app_ui_delegate.h"
 
 #include <string>
 

diff --git a/...pplications/chrome_help_app_ui_delegate.h → ...pplications/chrome_help_app_ui_delegate.h b/...pplications/chrome_help_app_ui_delegate.h → ...pplications/chrome_help_app_ui_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_HELP_APP_UI_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_HELP_APP_UI_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_HELP_APP_UI_DELEGATE_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_HELP_APP_UI_DELEGATE_H_
 
 #include "base/optional.h"
 #include "chromeos/components/help_app_ui/help_app_ui_delegate.h"
@@ -33,4 +33,4 @@ class ChromeHelpAppUIDelegate : public HelpAppUIDelegate {
   content::WebUI* web_ui_;  // Owns |this|.
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_HELP_APP_UI_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_HELP_APP_UI_DELEGATE_H_
diff --git a/...lications/chrome_media_app_ui_delegate.cc → ...lications/chrome_media_app_ui_delegate.cc b/...lications/chrome_media_app_ui_delegate.cc → ...lications/chrome_media_app_ui_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/chrome_media_app_ui_delegate.h"
+#include "chrome/browser/ash/web_applications/chrome_media_app_ui_delegate.h"
 
 #include "ash/constants/ash_features.h"
 #include "chrome/browser/browser_process.h"

diff --git a/...plications/chrome_media_app_ui_delegate.h → ...plications/chrome_media_app_ui_delegate.h b/...plications/chrome_media_app_ui_delegate.h → ...plications/chrome_media_app_ui_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_MEDIA_APP_UI_DELEGATE_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_MEDIA_APP_UI_DELEGATE_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_MEDIA_APP_UI_DELEGATE_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_MEDIA_APP_UI_DELEGATE_H_
 
 #include "base/optional.h"
 #include "chromeos/components/media_app_ui/media_app_ui_delegate.h"
@@ -31,4 +31,4 @@ class ChromeMediaAppUIDelegate : public MediaAppUIDelegate {
   content::WebUI* web_ui_;  // Owns |this|.
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CHROME_MEDIA_APP_UI_DELEGATE_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CHROME_MEDIA_APP_UI_DELEGATE_H_
diff --git a/...tivity_diagnostics_system_web_app_info.cc → ...tivity_diagnostics_system_web_app_info.cc b/...tivity_diagnostics_system_web_app_info.cc → ...tivity_diagnostics_system_web_app_info.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/connectivity_diagnostics_system_web_app_info.h"
+#include "chrome/browser/ash/web_applications/connectivity_diagnostics_system_web_app_info.h"
 
 #include <memory>
 
-#include "chrome/browser/chromeos/web_applications/system_web_app_install_utils.h"
+#include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chromeos/components/connectivity_diagnostics/url_constants.h"
 #include "chromeos/grit/connectivity_diagnostics_resources.h"

diff --git a/...ctivity_diagnostics_system_web_app_info.h → ...ctivity_diagnostics_system_web_app_info.h b/...ctivity_diagnostics_system_web_app_info.h → ...ctivity_diagnostics_system_web_app_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CONNECTIVITY_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CONNECTIVITY_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CONNECTIVITY_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CONNECTIVITY_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
 
 #include <memory>
 
@@ -13,4 +13,4 @@ struct WebApplicationInfo;
 std::unique_ptr<WebApplicationInfo>
 CreateWebAppInfoForConnectivityDiagnosticsSystemWebApp();
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CONNECTIVITY_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CONNECTIVITY_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
diff --git a/...chromeos/web_applications/crosh_loader.cc → ...wser/ash/web_applications/crosh_loader.cc b/...chromeos/web_applications/crosh_loader.cc → ...wser/ash/web_applications/crosh_loader.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/crosh_loader.h"
+#include "chrome/browser/ash/web_applications/crosh_loader.h"
 
-#include "chrome/browser/chromeos/web_applications/terminal_source.h"
+#include "chrome/browser/ash/web_applications/terminal_source.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/url_data_source.h"
 

diff --git a/.../chromeos/web_applications/crosh_loader.h → ...owser/ash/web_applications/crosh_loader.h b/.../chromeos/web_applications/crosh_loader.h → ...owser/ash/web_applications/crosh_loader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_LOADER_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_LOADER_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_LOADER_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_LOADER_H_
 
 #include "components/keyed_service/core/keyed_service.h"
 
@@ -20,4 +20,4 @@ class CroshLoader : public KeyedService {
   CroshLoader& operator=(const CroshLoader&) = delete;
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_LOADER_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_LOADER_H_
diff --git a/.../web_applications/crosh_loader_factory.cc → .../web_applications/crosh_loader_factory.cc b/.../web_applications/crosh_loader_factory.cc → .../web_applications/crosh_loader_factory.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/crosh_loader_factory.h"
+#include "chrome/browser/ash/web_applications/crosh_loader_factory.h"
 
-#include "chrome/browser/chromeos/web_applications/crosh_loader.h"
+#include "chrome/browser/ash/web_applications/crosh_loader.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"

diff --git a/...s/web_applications/crosh_loader_factory.h → ...h/web_applications/crosh_loader_factory.h b/...s/web_applications/crosh_loader_factory.h → ...h/web_applications/crosh_loader_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_LOADER_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_LOADER_FACTORY_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_LOADER_FACTORY_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_LOADER_FACTORY_H_
 
 #include "base/no_destructor.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -37,4 +37,4 @@ class CroshLoaderFactory : public BrowserContextKeyedServiceFactory {
   bool ServiceIsNULLWhileTesting() const override;
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_LOADER_FACTORY_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_LOADER_FACTORY_H_
diff --git a/...applications/crosh_system_web_app_info.cc → ...applications/crosh_system_web_app_info.cc b/...applications/crosh_system_web_app_info.cc → ...applications/crosh_system_web_app_info.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/crosh_system_web_app_info.h"
+#include "chrome/browser/ash/web_applications/crosh_system_web_app_info.h"
 
 #include <memory>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_install_utils.h"
+#include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/grit/chrome_unscaled_resources.h"

diff --git a/..._applications/crosh_system_web_app_info.h → ..._applications/crosh_system_web_app_info.h b/..._applications/crosh_system_web_app_info.h → ..._applications/crosh_system_web_app_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_SYSTEM_WEB_APP_INFO_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_SYSTEM_WEB_APP_INFO_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_SYSTEM_WEB_APP_INFO_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_SYSTEM_WEB_APP_INFO_H_
 
 #include <memory>
 
@@ -12,4 +12,4 @@ struct WebApplicationInfo;
 // Returns a WebApplicationInfo used to install the app.
 std::unique_ptr<WebApplicationInfo> CreateWebAppInfoForCroshSystemWebApp();
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_CROSH_SYSTEM_WEB_APP_INFO_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_CROSH_SYSTEM_WEB_APP_INFO_H_
diff --git a/...iagnostics_app_integration_browsertest.cc → ...iagnostics_app_integration_browsertest.cc b/...iagnostics_app_integration_browsertest.cc → ...iagnostics_app_integration_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include "ash/constants/ash_features.h"
 #include "base/test/scoped_feature_list.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_integration_test.h"
+#include "chrome/browser/ash/web_applications/system_web_app_integration_test.h"
 #include "chrome/browser/web_applications/system_web_app_manager.h"
 #include "chromeos/components/diagnostics_ui/url_constants.h"
 #include "content/public/test/browser_test.h"

diff --git a/...ations/diagnostics_system_web_app_info.cc → ...ations/diagnostics_system_web_app_info.cc b/...ations/diagnostics_system_web_app_info.cc → ...ations/diagnostics_system_web_app_info.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/diagnostics_system_web_app_info.h"
+#include "chrome/browser/ash/web_applications/diagnostics_system_web_app_info.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_install_utils.h"
+#include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chromeos/components/diagnostics_ui/url_constants.h"
 #include "chromeos/grit/chromeos_diagnostics_app_resources.h"

diff --git a/...cations/diagnostics_system_web_app_info.h → ...cations/diagnostics_system_web_app_info.h b/...cations/diagnostics_system_web_app_info.h → ...cations/diagnostics_system_web_app_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
 
 #include <memory>
 
@@ -13,4 +13,4 @@ struct WebApplicationInfo;
 std::unique_ptr<WebApplicationInfo>
 CreateWebAppInfoForDiagnosticsSystemWebApp();
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_DIAGNOSTICS_SYSTEM_WEB_APP_INFO_H_
diff --git a/...hromeos/web_applications/eche_app_info.cc → ...ser/ash/web_applications/eche_app_info.cc b/...hromeos/web_applications/eche_app_info.cc → ...ser/ash/web_applications/eche_app_info.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/eche_app_info.h"
+#include "chrome/browser/ash/web_applications/eche_app_info.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_install_utils.h"
+#include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chromeos/components/eche_app_ui/url_constants.h"

diff --git a/...chromeos/web_applications/eche_app_info.h → ...wser/ash/web_applications/eche_app_info.h b/...chromeos/web_applications/eche_app_info.h → ...wser/ash/web_applications/eche_app_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_ECHE_APP_INFO_H_
-#define CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_ECHE_APP_INFO_H_
+#ifndef CHROME_BROWSER_ASH_WEB_APPLICATIONS_ECHE_APP_INFO_H_
+#define CHROME_BROWSER_ASH_WEB_APPLICATIONS_ECHE_APP_INFO_H_
 
 #include <memory>
 
@@ -12,4 +12,4 @@ struct WebApplicationInfo;
 // Return a WebApplicationInfo used to install the app.
 std::unique_ptr<WebApplicationInfo> CreateWebAppInfoForEcheApp();
 
-#endif  // CHROME_BROWSER_CHROMEOS_WEB_APPLICATIONS_ECHE_APP_INFO_H_
+#endif  // CHROME_BROWSER_ASH_WEB_APPLICATIONS_ECHE_APP_INFO_H_
diff --git a/...tions/eche_app_integration_browsertest.cc → ...tions/eche_app_integration_browsertest.cc b/...tions/eche_app_integration_browsertest.cc → ...tions/eche_app_integration_browsertest.cc
@@ -4,7 +4,7 @@
 
 #include "ash/constants/ash_features.h"
 #include "base/test/scoped_feature_list.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_integration_test.h"
+#include "chrome/browser/ash/web_applications/system_web_app_integration_test.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"

diff --git a/...applications/file_manager_web_app_info.cc → ...applications/file_manager_web_app_info.cc b/...applications/file_manager_web_app_info.cc → ...applications/file_manager_web_app_info.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/web_applications/file_manager_web_app_info.h"
+#include "chrome/browser/ash/web_applications/file_manager_web_app_info.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/web_applications/system_web_app_install_utils.h"
+#include "chrome/browser/ash/web_applications/system_web_app_install_utils.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_application_info.h"
 #include "chromeos/components/file_manager/url_constants.h"