Separate cert loading code from CertLibrary and move to src/chromeos

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/contacts/contact_manager.h"
+#include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
 #include "chrome/browser/chromeos/extensions/default_app_order.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
@@ skipping 51 matching lines @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_library.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/ime/xkeyboard.h"
 #include "chromeos/login/login_state.h"
+#include "chromeos/network/cert_loader.h"
 #include "chromeos/network/geolocation_handler.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/power_save_blocker.h"
@@ skipping 145 matching lines @@
   }
 }
 
 void RunAutoLaunchKioskApp() {
   // KioskAppLauncher deletes itself when done.
   (new KioskAppLauncher(
       KioskAppManager::Get()->GetAutoLaunchApp()))->Start();
 
   // Login screen is skipped but 'login-prompt-visible' signal is still needed.
   LOG(INFO) << "Kiosk app auto launch >> login-prompt-visible";
-  chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
+  DBusThreadManager::Get()->GetSessionManagerClient()->
       EmitLoginPromptVisible();
 }
 
 bool UseNewAudioHandler() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(ash::switches::kAshDisableNewAudioHandler);
 }
 
 }  // namespace
 
 namespace internal {
 
 // Wrapper class for initializing dbus related services and shutting them
 // down. This gets instantiated in a scoped_ptr so that shutdown methods in the
 // destructor will get called if and only if this has been instantiated.
 class DBusServices {

[pneubeck (no reviews), 2013/05/02 14:58:35]

The name of this class and its comment don't match the content even more clearly
now.
We should remember to clean that up.

[stevenjb, 2013/05/03 01:00:31]

Agreed. I plan to do a cleanup pass soon after 28 branches.

  public:
   explicit DBusServices(const content::MainFunctionParams& parameters)
       : cros_initialized_(false) {
     // Initialize CrosLibrary only for the browser, unless running tests
     // (which do their own CrosLibrary setup).
     if (!parameters.ui_task) {
       const bool use_stub = !base::chromeos::IsRunningOnChromeOS();
       CrosLibrary::Initialize(use_stub);
       cros_initialized_ = true;
     }
 
     // Initialize DBusThreadManager for the browser. This must be done after
     // the main message loop is started, as it uses the message loop.
     DBusThreadManager::Initialize();
     CrosDBusService::Initialize();
 
+    LoginState::Initialize();
+    CertLoader::Initialize();
+    CertLibrary::Initialize();
     CryptohomeLibrary::Initialize();
 
     // This function and SystemKeyEventListener use InputMethodManager.
     chromeos::input_method::Initialize(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::UI),
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::FILE));
     disks::DiskMountManager::Initialize();
     cryptohome::AsyncMethodCaller::Initialize();
 
-    chromeos::LoginState::Initialize();
-
     // Always initialize these handlers which should not conflict with
     // NetworkLibrary.
-    chromeos::network_event_log::Initialize();
-    chromeos::GeolocationHandler::Initialize();
-    chromeos::NetworkStateHandler::Initialize();
+    network_event_log::Initialize();
+    GeolocationHandler::Initialize();
+    NetworkStateHandler::Initialize();
 
-    chromeos::NetworkConfigurationHandler::Initialize();
-    chromeos::ManagedNetworkConfigurationHandler::Initialize();
+    NetworkConfigurationHandler::Initialize();
+    ManagedNetworkConfigurationHandler::Initialize();
 
     // Initialize the network change notifier for Chrome OS. The network
     // change notifier starts to monitor changes from the power manager and
     // the network manager.
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
             chromeos::switches::kDisableNewNetworkChangeNotifier)) {
       NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize();
     } else {
       CrosNetworkChangeNotifierFactory::GetInstance()->Init();
     }
 
     // Likewise, initialize the upgrade detector for Chrome OS. The upgrade
     // detector starts to monitor changes from the update engine.
     UpgradeDetectorChromeos::GetInstance()->Init();
 
     if (base::chromeos::IsRunningOnChromeOS()) {
       // Disable Num Lock on X start up for http://crosbug.com/29169.
       input_method::GetInputMethodManager()->GetXKeyboard()->
           SetNumLockEnabled(false);
     }
 
     // Initialize the device settings service so that we'll take actions per
     // signals sent from the session manager. This needs to happen before
     // g_browser_process initializes BrowserPolicyConnector.
     DeviceSettingsService::Initialize();
     DeviceSettingsService::Get()->SetSessionManager(
         DBusThreadManager::Get()->GetSessionManagerClient(),
         OwnerKeyUtil::Create());
-    chromeos::ConnectivityStateHelper::Initialize();
+    ConnectivityStateHelper::Initialize();
   }
 
   ~DBusServices() {
-    chromeos::ConnectivityStateHelper::Shutdown();
+    ConnectivityStateHelper::Shutdown();
     // CrosLibrary is shut down before DBusThreadManager even though it
     // is initialized first becuase some of its libraries depend on DBus
     // clients.
     // TODO(hashimoto): Resolve this situation by removing CrosLibrary.
     // (crosbug.com/26160)
     if (cros_initialized_ && CrosLibrary::Get())
       CrosLibrary::Shutdown();
 
-    chromeos::ManagedNetworkConfigurationHandler::Shutdown();
-    chromeos::NetworkConfigurationHandler::Shutdown();
+    ManagedNetworkConfigurationHandler::Shutdown();
+    NetworkConfigurationHandler::Shutdown();
 
-    chromeos::NetworkStateHandler::Shutdown();
-    chromeos::GeolocationHandler::Shutdown();
-    chromeos::network_event_log::Shutdown();
+    NetworkStateHandler::Shutdown();
+    GeolocationHandler::Shutdown();
+    network_event_log::Shutdown();
 
-    chromeos::LoginState::Shutdown();
+    LoginState::Shutdown();
 
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
     input_method::Shutdown();
     CryptohomeLibrary::Shutdown();
+    CertLibrary::Shutdown();

[pneubeck (no reviews), 2013/05/02 14:58:35]

Shutdown of CertLoader?

Can you use the reverse order for the shutdowns compared to the inits where
possible? I'd find that less surprising. And maybe drop a comment, if there's a
reason to deviate from reverse order.

[stevenjb, 2013/05/03 01:00:31]

Done.

     CrosDBusService::Shutdown();
     // NOTE: This must only be called if Initialize() was called.
     DBusThreadManager::Shutdown();
   }
 
  private:
   bool cros_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusServices);
 };
@@ skipping 111 matching lines @@
 
   // Listen for system key events so that the user will be able to adjust the
   // volume on the login screen, if Chrome is running on Chrome OS
   // (i.e. not Linux desktop), and in non-test mode.
   // Note: SystemKeyEventListener depends on the DBus thread.
   if (base::chromeos::IsRunningOnChromeOS() &&
       !parameters().ui_task) {  // ui_task is non-NULL when running tests.
     SystemKeyEventListener::Initialize();
   }
 
-  chromeos::DeviceOAuth2TokenServiceFactory::Initialize();
+  DeviceOAuth2TokenServiceFactory::Initialize();
 
   ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
 }
 
 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
   // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
   // -- immediately before Profile creation().
 
   // Now that the file thread exists we can record our stats.
   BootTimesLoader::Get()->RecordChromeMainStats();
@@ skipping 64 matching lines @@
     user_manager->SessionStarted();
   }
 
   if (!app_order_loader_) {
     app_order_loader_.reset(
         new default_app_order::ExternalLoader(true /* async */));
   }
 
   // Initialize magnification manager before ash tray is created. And this must
   // be placed after UserManager::SessionStarted();
-  chromeos::MagnificationManager::Initialize();
+  MagnificationManager::Initialize();
 
   // Add observers for WallpaperManager. This depends on PowerManagerClient,
   // TimezoneSettings and CrosSettings.
   WallpaperManager::Get()->AddObservers();
 
 #if defined(USE_LINUX_BREAKPAD)
   cros_version_loader_.GetVersion(VersionLoader::VERSION_FULL,
                                   base::Bind(&ChromeOSVersionCallback),
                                   &tracker_);
 #endif
@@ skipping 142 matching lines @@
   BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
 
   g_browser_process->platform_part()->oom_priority_manager()->Stop();
 
   // Stops LoginUtils background fetchers. This is needed because IO thread is
   // going to stop soon after this function. The pending background jobs could
   // cause it to crash during shutdown.
   LoginUtils::Get()->StopBackgroundFetchers();
 
   // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
-  chromeos::DeviceOAuth2TokenServiceFactory::Shutdown();
+  DeviceOAuth2TokenServiceFactory::Shutdown();
 
   // Shutdown the upgrade detector for Chrome OS. The upgrade detector
   // stops monitoring changes from the update engine.
   if (UpgradeDetectorChromeos::GetInstance())
     UpgradeDetectorChromeos::GetInstance()->Shutdown();
 
   // Shutdown the network change notifier for Chrome OS. The network
   // change notifier stops monitoring changes from the power manager and
   // the network manager.
   if (CrosNetworkChangeNotifierFactory::GetInstance())
@@ skipping 16 matching lines @@
   suspend_observer_.reset();
   resume_observer_.reset();
   brightness_observer_.reset();
   retail_mode_power_save_blocker_.reset();
   peripheral_battery_observer_.reset();
 
   // The XInput2 event listener needs to be shut down earlier than when
   // Singletons are finally destroyed in AtExitManager.
   XInputHierarchyChangedEventListener::GetInstance()->Stop();
 
-  // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
+  // SystemKeyEventListener::Shutdown() is always safe to call,
   // even if Initialize() wasn't called.
   SystemKeyEventListener::Shutdown();
   imageburner::BurnManager::Shutdown();
   if (UseNewAudioHandler()) {
     CrasAudioHandler::Shutdown();
   } else {
     AudioHandler::Shutdown();
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kEnableChromeAudioSwitching))
     CrasAudioSwitchHandler::Shutdown();
 
   WebSocketProxyController::Shutdown();
 
   // Let classes unregister themselves as observers of the ash::Shell singleton
   // before the shell is destroyed.
   user_activity_notifier_.reset();
   video_activity_notifier_.reset();
   display_configuration_observer_.reset();
 
   // Detach D-Bus clients before DBusThreadManager is shut down.
   power_button_observer_.reset();
   screensaver_controller_.reset();
   idle_action_warning_observer_.reset();
 
   // Delete ContactManager while |g_browser_process| is still alive.
   contact_manager_.reset();
 
-  chromeos::MagnificationManager::Shutdown();
+  MagnificationManager::Shutdown();
 
   // Let the UserManager and WallpaperManager unregister itself as an observer
   // of the CrosSettings singleton before it is destroyed.
   UserManager::Get()->Shutdown();
   WallpaperManager::Get()->Shutdown();
 
   // Let the AutomaticRebootManager unregister itself as an observer of several
   // subsystems.
   automatic_reboot_manager_.reset();
 
@@ skipping 54 matching lines @@
   trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
   trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
   trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
   trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
   trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
   // This is necessary to start the experiment as a side effect.
   trial->group();
 }
 
 }  //  namespace chromeos