Rename chrome/browser/chromeos/lacros -> chrome/browser/chromeos/crosapi.

This CL is a refactor with no intended behavior change.

Bug: 1104273
Change-Id: I3a17b8da6c2e61f8033b01b1d31dc1b5de84a91d
TBR: dominickn@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2293075
Commit-Queue: Erik Chen <erikchen@chromium.org>
Auto-Submit: Erik Chen <erikchen@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#787415}

chrome/browser/apps/app_service/lacros_apps.cc

@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "build/branding_buildflags.h"
 #include "chrome/browser/apps/app_service/app_icon_factory.h"
-#include "chrome/browser/chromeos/lacros/lacros_manager.h"
+#include "chrome/browser/chromeos/crosapi/lacros_manager.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "components/services/app_service/public/mojom/types.mojom.h"

chrome/browser/chromeos/BUILD.gn

@@ -903,6 +903,16 @@ source_set("chromeos") {
     "chrome_content_browser_client_chromeos_part.h",
     "concierge_helper_service.cc",
     "concierge_helper_service.h",
+    "crosapi/ash_chrome_service_impl.cc",
+    "crosapi/ash_chrome_service_impl.h",
+    "crosapi/lacros_loader.cc",
+    "crosapi/lacros_loader.h",
+    "crosapi/lacros_manager.cc",
+    "crosapi/lacros_manager.h",
+    "crosapi/lacros_util.cc",
+    "crosapi/lacros_util.h",
+    "crosapi/screen_manager_crosapi.cc",
+    "crosapi/screen_manager_crosapi.h",
     "crosapi/select_file_crosapi.cc",
     "crosapi/select_file_crosapi.h",
     "crostini/ansible/ansible_management_service.cc",
@@ -1357,16 +1367,6 @@ source_set("chromeos") {
     "kerberos/kerberos_credentials_manager_factory.h",
     "kerberos/kerberos_ticket_expiry_notification.cc",
     "kerberos/kerberos_ticket_expiry_notification.h",
-    "lacros/ash_chrome_service_impl.cc",
-    "lacros/ash_chrome_service_impl.h",
-    "lacros/lacros_loader.cc",
-    "lacros/lacros_loader.h",
-    "lacros/lacros_manager.cc",
-    "lacros/lacros_manager.h",
-    "lacros/lacros_util.cc",
-    "lacros/lacros_util.h",
-    "lacros/screen_manager_crosapi.cc",
-    "lacros/screen_manager_crosapi.h",
     "language_preferences.cc",
     "language_preferences.h",
     "launcher_search_provider/error_reporter.cc",
@@ -3023,6 +3023,7 @@ source_set("unit_tests") {
     "child_accounts/usage_time_state_notifier_unittest.cc",
     "chrome_content_browser_client_chromeos_part_unittest.cc",
     "concierge_helper_service_unittest.cc",
+    "crosapi/lacros_util_unittest.cc",
     "crostini/ansible/ansible_management_service_unittest.cc",
     "crostini/crostini_disk_unittest.cc",
     "crostini/crostini_export_import_unittest.cc",
@@ -3154,7 +3155,6 @@ source_set("unit_tests") {
     "input_method/ui/undo_window_unittest.cc",
     "kerberos/kerberos_credentials_manager_test.cc",
     "kerberos/kerberos_ticket_expiry_notification_test.cc",
-    "lacros/lacros_util_unittest.cc",
     "local_search_service/content_extraction_utils_unittest.cc",
     "local_search_service/inverted_index_search_unittest.cc",
     "local_search_service/inverted_index_unittest.cc",

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -44,6 +44,7 @@
 #include "chrome/browser/chromeos/app_mode/web_app/web_kiosk_app_manager.h"
 #include "chrome/browser/chromeos/arc/session/arc_service_launcher.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
+#include "chrome/browser/chromeos/crosapi/lacros_manager.h"
 #include "chrome/browser/chromeos/crostini/crostini_unsupported_action_notifier.h"
 #include "chrome/browser/chromeos/crostini/crosvm_metrics.h"
 #include "chrome/browser/chromeos/dbus/chrome_features_service_provider.h"
@@ -70,7 +71,6 @@
 #include "chrome/browser/chromeos/extensions/login_screen/login_screen_ui/ui_handler.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
-#include "chrome/browser/chromeos/lacros/lacros_manager.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
 #include "chrome/browser/chromeos/logging.h"

chrome/browser/chromeos/crosapi/DEPS

 specific_include_rules = {
+  "screen_manager_crosapi\.cc": [
+    # For window parenting.
+    "+ash/shell.h",
+  ],
   "select_file_crosapi\.cc": [
     # For window parenting.
     "+ash/shell.h",

chrome/browser/chromeos/crosapi/README.md

+This directory contains the ash-chrome implementation of the ChromeOS API
+(crosapi) used by lacros-chrome. There are currently two types of files in this
+directory:
+  * Files for launching and connecting to lacros-chrome. These are named
+    lacros_foo.
+  * Files that implement the crosapi. These are named foo_crosapi.

chrome/browser/chromeos/lacros/ash_chrome_service_impl.cc → chrome/browser/chromeos/crosapi/ash_chrome_service_impl.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/lacros/ash_chrome_service_impl.h"
+#include "chrome/browser/chromeos/crosapi/ash_chrome_service_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
+#include "chrome/browser/chromeos/crosapi/screen_manager_crosapi.h"
 #include "chrome/browser/chromeos/crosapi/select_file_crosapi.h"
-#include "chrome/browser/chromeos/lacros/screen_manager_crosapi.h"
 #include "chromeos/crosapi/mojom/screen_manager.mojom.h"
 #include "chromeos/crosapi/mojom/select_file.mojom.h"
 

chrome/browser/chromeos/lacros/ash_chrome_service_impl.h → chrome/browser/chromeos/crosapi/ash_chrome_service_impl.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_LACROS_ASH_CHROME_SERVICE_IMPL_H_
-#define CHROME_BROWSER_CHROMEOS_LACROS_ASH_CHROME_SERVICE_IMPL_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_ASH_CHROME_SERVICE_IMPL_H_
+#define CHROME_BROWSER_CHROMEOS_CROSAPI_ASH_CHROME_SERVICE_IMPL_H_
 
 #include <memory>
 
@@ -35,4 +35,4 @@ class AshChromeServiceImpl : public crosapi::mojom::AshChromeService {
   std::unique_ptr<SelectFileCrosapi> select_file_crosapi_;
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_LACROS_ASH_CHROME_SERVICE_IMPL_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_ASH_CHROME_SERVICE_IMPL_H_

chrome/browser/chromeos/lacros/lacros_loader.cc → chrome/browser/chromeos/crosapi/lacros_loader.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/lacros/lacros_loader.h"
+#include "chrome/browser/chromeos/crosapi/lacros_loader.h"
 
 #include <utility>
 
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
-#include "chrome/browser/chromeos/lacros/lacros_util.h"
+#include "chrome/browser/chromeos/crosapi/lacros_util.h"
 #include "chromeos/constants/chromeos_switches.h"
 
 namespace {

chrome/browser/chromeos/lacros/lacros_loader.h → chrome/browser/chromeos/crosapi/lacros_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_LACROS_LACROS_LOADER_H_
-#define CHROME_BROWSER_CHROMEOS_LACROS_LACROS_LOADER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_LOADER_H_
+#define CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_LOADER_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ -49,4 +49,4 @@ class LacrosLoader {
   base::WeakPtrFactory<LacrosLoader> weak_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_LACROS_LACROS_LOADER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_LOADER_H_

chrome/browser/chromeos/lacros/lacros_manager.cc → chrome/browser/chromeos/crosapi/lacros_manager.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/lacros/lacros_manager.h"
+#include "chrome/browser/chromeos/crosapi/lacros_manager.h"
 
 #include <string>
 #include <utility>
@@ -22,9 +22,9 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
-#include "chrome/browser/chromeos/lacros/ash_chrome_service_impl.h"
-#include "chrome/browser/chromeos/lacros/lacros_loader.h"
-#include "chrome/browser/chromeos/lacros/lacros_util.h"
+#include "chrome/browser/chromeos/crosapi/ash_chrome_service_impl.h"
+#include "chrome/browser/chromeos/crosapi/lacros_loader.h"
+#include "chrome/browser/chromeos/crosapi/lacros_util.h"
 #include "chrome/browser/component_updater/cros_component_manager.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "chromeos/constants/chromeos_switches.h"

chrome/browser/chromeos/lacros/lacros_manager.h → chrome/browser/chromeos/crosapi/lacros_manager.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_LACROS_LACROS_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_LACROS_LACROS_MANAGER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_MANAGER_H_
 
 #include <memory>
 
@@ -148,4 +148,4 @@ class LacrosManager : public session_manager::SessionManagerObserver {
   base::WeakPtrFactory<LacrosManager> weak_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_LACROS_LACROS_MANAGER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_MANAGER_H_

chrome/browser/chromeos/lacros/lacros_util.cc → chrome/browser/chromeos/crosapi/lacros_util.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/lacros/lacros_util.h"
+#include "chrome/browser/chromeos/crosapi/lacros_util.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"

chrome/browser/chromeos/lacros/lacros_util.h → chrome/browser/chromeos/crosapi/lacros_util.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_LACROS_LACROS_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_LACROS_LACROS_UTIL_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_UTIL_H_
+#define CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_UTIL_H_
 
 namespace base {
 class FilePath;
@@ -27,4 +27,4 @@ bool IsLacrosAllowed(version_info::Channel channel);
 
 }  // namespace lacros_util
 
-#endif  // CHROME_BROWSER_CHROMEOS_LACROS_LACROS_UTIL_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_LACROS_UTIL_H_

chrome/browser/chromeos/lacros/lacros_util_unittest.cc → chrome/browser/chromeos/crosapi/lacros_util_unittest.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/lacros/lacros_util.h"
+#include "chrome/browser/chromeos/crosapi/lacros_util.h"
 
 #include "components/account_id/account_id.h"
 #include "components/user_manager/fake_user_manager.h"

chrome/browser/chromeos/lacros/screen_manager_crosapi.cc → chrome/browser/chromeos/crosapi/screen_manager_crosapi.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/lacros/screen_manager_crosapi.h"
+#include "chrome/browser/chromeos/crosapi/screen_manager_crosapi.h"
 
 #include <utility>
 #include <vector>

chrome/browser/chromeos/lacros/screen_manager_crosapi.h → chrome/browser/chromeos/crosapi/screen_manager_crosapi.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_LACROS_SCREEN_MANAGER_CROSAPI_H_
-#define CHROME_BROWSER_CHROMEOS_LACROS_SCREEN_MANAGER_CROSAPI_H_
+#ifndef CHROME_BROWSER_CHROMEOS_CROSAPI_SCREEN_MANAGER_CROSAPI_H_
+#define CHROME_BROWSER_CHROMEOS_CROSAPI_SCREEN_MANAGER_CROSAPI_H_
 
 #include <stdint.h>
 
@@ -65,4 +65,4 @@ class ScreenManagerCrosapi : public crosapi::mojom::ScreenManager,
   base::WeakPtrFactory<ScreenManagerCrosapi> weak_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_CHROMEOS_LACROS_SCREEN_MANAGER_CROSAPI_H_
+#endif  // CHROME_BROWSER_CHROMEOS_CROSAPI_SCREEN_MANAGER_CROSAPI_H_

chrome/browser/chromeos/lacros/DEPS

-specific_include_rules = {
-  "screen_manager_crosapi\.cc": [
-    # For window parenting.
-    "+ash/shell.h",
-  ],
-}