chromeos: Change all clients of LoginLibrary to use SessionManagerClient.

chrome/browser/chromeos/dbus/dbus_thread_manager.cc

 // Copyright (c) 2011 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/dbus/dbus_thread_manager.h"
 
 #include "base/command_line.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
+#include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/dbus/sensors_source.h"
 #include "chrome/common/chrome_switches.h"
 #include "dbus/bus.h"
 
 namespace chromeos {
 
 static DBusThreadManager* g_dbus_thread_manager = NULL;
 
 DBusThreadManager::DBusThreadManager() {
@@ skipping 17 matching lines @@
 
   // Start monitoring sensors if needed.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableSensors)) {
     sensors_source_.reset(new SensorsSource);
     sensors_source_->Init(system_bus_.get());
   }
 
   // Create the power manager client.
   power_manager_client_.reset(PowerManagerClient::Create(system_bus_.get()));
+  // Create the session manager client.
+  session_manager_client_.reset(
+      SessionManagerClient::Create(system_bus_.get()));
 }
 
 DBusThreadManager::~DBusThreadManager() {
   // Shut down the bus. During the browser shutdown, it's ok to shut down
   // the bus synchronously.
   system_bus_->ShutdownOnDBusThreadAndBlock();
 
   // Stop the D-Bus thread.
   dbus_thread_->Stop();
 
   // D-Bus clients should be deleted after the D-Bus thread is stopped.
   // See "CALLBACKS IN D-BUS CLIENTS" in the header file for why.
   delete cros_dbus_service_;
 }
 
 void DBusThreadManager::Initialize() {
-  CHECK(!g_dbus_thread_manager);
+  if (g_dbus_thread_manager) {
+    // This can happen in tests.
+    LOG(WARNING) << "DBusThreadManager::Initialize() was already called";
+    return;
+  }
   g_dbus_thread_manager = new DBusThreadManager;
   VLOG(1) << "DBusThreadManager initialized";
 }
 
 void DBusThreadManager::Shutdown() {
   if (!g_dbus_thread_manager) {
     // This can happen in tests.
     LOG(WARNING) << "DBusThreadManager::Shutdown() called with NULL manager";
     return;
   }
   delete g_dbus_thread_manager;
   g_dbus_thread_manager = NULL;
   VLOG(1) << "DBusThreadManager Shutdown completed";
 }
 
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
+void DBusThreadManager::set_session_manager_client_for_testing(
+    SessionManagerClient* session_manager_client) {
+  session_manager_client_.reset(session_manager_client);
+}
+
 }  // namespace chromeos