Lacros: Move out classes in c/b/c/lacros from chromeos namespace.

Bug: None
Test: Build
Change-Id: I98fdd4ac735dd1cf4e107cc6bb85570ae2114ae1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284845Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Auto-Submit: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786073}

chrome/browser/apps/app_service/lacros_apps.cc

@@ -68,9 +68,9 @@ apps::mojom::IconKeyPtr LacrosApps::NewIconKey(State state) {
 void LacrosApps::Connect(
     mojo::PendingRemote<apps::mojom::Subscriber> subscriber_remote,
     apps::mojom::ConnectOptionsPtr opts) {
-  bool is_ready = chromeos::LacrosManager::Get()->IsReady();
+  bool is_ready = LacrosManager::Get()->IsReady();
   if (!is_ready) {
-    chromeos::LacrosManager::Get()->SetLoadCompleteCallback(base::BindOnce(
+    LacrosManager::Get()->SetLoadCompleteCallback(base::BindOnce(
         &LacrosApps::OnLoadComplete, weak_factory_.GetWeakPtr()));
   }
   std::vector<apps::mojom::AppPtr> apps;
@@ -105,7 +105,7 @@ void LacrosApps::Launch(const std::string& app_id,
                         apps::mojom::LaunchSource launch_source,
                         int64_t display_id) {
   DCHECK_EQ(extension_misc::kLacrosAppId, app_id);
-  chromeos::LacrosManager::Get()->Start();
+  LacrosManager::Get()->Start();
 }
 
 void LacrosApps::GetMenuModel(const std::string& app_id,

chrome/browser/chromeos/chrome_browser_main_chromeos.h

@@ -17,6 +17,7 @@ class AssistantClientImpl;
 class AssistantStateClient;
 class ChromeKeyboardControllerClient;
 class ImageDownloaderImpl;
+class LacrosManager;
 class SpokenFeedbackEventRewriterDelegate;
 
 namespace lock_screen_apps {
@@ -48,7 +49,6 @@ class EventRewriterDelegateImpl;
 class FastTransitionObserver;
 class GnubbyNotification;
 class IdleActionWarningObserver;
-class LacrosManager;
 class LoginScreenExtensionsLifetimeManager;
 class LoginScreenExtensionsStorageCleaner;
 class LowDiskNotification;

chrome/browser/chromeos/lacros/ash_chrome_service_impl.cc

@@ -10,8 +10,6 @@
 #include "chrome/browser/chromeos/lacros/select_file_impl.h"
 #include "chromeos/lacros/mojom/select_file.mojom.h"
 
-namespace chromeos {
-
 AshChromeServiceImpl::AshChromeServiceImpl(
     mojo::PendingReceiver<lacros::mojom::AshChromeService> pending_receiver)
     : receiver_(this, std::move(pending_receiver)) {
@@ -26,5 +24,3 @@ void AshChromeServiceImpl::BindSelectFile(
     mojo::PendingReceiver<lacros::mojom::SelectFile> receiver) {
   select_file_impl_ = std::make_unique<SelectFileImpl>(std::move(receiver));
 }
-
-}  // namespace chromeos

chrome/browser/chromeos/lacros/ash_chrome_service_impl.h

@@ -11,8 +11,6 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
-namespace chromeos {
-
 class SelectFileImpl;
 
 // Implementation of AshChromeService. It provides a set of APIs that
@@ -33,6 +31,4 @@ class AshChromeServiceImpl : public lacros::mojom::AshChromeService {
   std::unique_ptr<SelectFileImpl> select_file_impl_;
 };
 
-}  // namespace chromeos
-
 #endif  // CHROME_BROWSER_CHROMEOS_LACROS_ASH_CHROME_SERVICE_IMPL_H_

chrome/browser/chromeos/lacros/lacros_loader.cc

@@ -16,7 +16,6 @@
 #include "chrome/browser/chromeos/lacros/lacros_util.h"
 #include "chromeos/constants/chromeos_switches.h"
 
-namespace chromeos {
 namespace {
 
 constexpr char kLacrosComponentName[] = "lacros-fishfood";
@@ -104,5 +103,3 @@ void LacrosLoader::UnloadAfterCleanUp(bool was_installed) {
   if (was_installed)
     component_manager_->Unload(kLacrosComponentName);
 }
-
-}  // namespace chromeos

chrome/browser/chromeos/lacros/lacros_loader.h

@@ -11,8 +11,6 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/component_updater/cros_component_manager.h"
 
-namespace chromeos {
-
 // Manages download of the lacros-chrome binary.
 class LacrosLoader {
  public:
@@ -51,6 +49,4 @@ class LacrosLoader {
   base::WeakPtrFactory<LacrosLoader> weak_factory_{this};
 };
 
-}  // namespace chromeos
-
 #endif  // CHROME_BROWSER_CHROMEOS_LACROS_LACROS_LOADER_H_

chrome/browser/chromeos/lacros/lacros_manager.cc

@@ -40,7 +40,6 @@
 // to debug and develop. Get rid of the log spamming
 // when it gets stable enough.
 
-namespace chromeos {
 namespace {
 
 // Pointer to the global instance of LacrosManager.
@@ -326,5 +325,3 @@ void LacrosManager::OnLoadComplete(const base::FilePath& path) {
     std::move(load_complete_callback_).Run(success);
   }
 }
-
-}  // namespace chromeos

chrome/browser/chromeos/lacros/lacros_manager.h

@@ -20,8 +20,6 @@ namespace component_updater {
 class CrOSComponentManager;
 }  // namespace component_updater
 
-namespace chromeos {
-
 class AshChromeServiceImpl;
 class LacrosLoader;
 
@@ -150,6 +148,4 @@ class LacrosManager : public session_manager::SessionManagerObserver {
   base::WeakPtrFactory<LacrosManager> weak_factory_{this};
 };
 
-}  // namespace chromeos
-
 #endif  // CHROME_BROWSER_CHROMEOS_LACROS_LACROS_MANAGER_H_

chrome/browser/chromeos/lacros/select_file_impl.cc

@@ -16,7 +16,6 @@
 #include "ui/shell_dialogs/select_file_policy.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
-namespace chromeos {
 namespace {
 
 ui::SelectFileDialog::Type GetUiType(lacros::mojom::SelectFileDialogType type) {
@@ -120,5 +119,3 @@ void SelectFileImpl::Select(lacros::mojom::SelectFileOptionsPtr options,
   // Deletes itself when the dialog closes.
   new SelectFileDialogHolder(std::move(options), std::move(callback));
 }
-
-}  // namespace chromeos

chrome/browser/chromeos/lacros/select_file_impl.h

@@ -9,8 +9,6 @@
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 
-namespace chromeos {
-
 // Implements the SelectFile mojo interface for open/save dialogs. Wraps the
 // underlying Chrome OS SelectFileExtension implementation, which uses the WebUI
 // file manager to provide the dialogs. Lives on the UI thread.
@@ -30,6 +28,4 @@ class SelectFileImpl : public lacros::mojom::SelectFile {
   mojo::Receiver<lacros::mojom::SelectFile> receiver_;
 };
 
-}  // namespace chromeos
-
 #endif  // CHROME_BROWSER_CHROMEOS_LACROS_SELECT_FILE_IMPL_H_