chromeos: Separate CrosDBusService Initialize/Shutdown from DBusThreadManager

chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc

Index: chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
index cb62417d0d6a4487d82bd3c86d2427e03545b3ea..a3814ccc01c35b28a7494355b111f6bc18388b41 100644
--- a/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
+++ b/chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc
@@ -63,15 +63,15 @@ class CrosDBusServiceTest : public testing::Test {
     // Start() will be called with |mock_exported_object_|.
     EXPECT_CALL(*mock_proxy_resolution_service_provider,
                 Start(Eq(mock_exported_object_))).WillOnce(Return());
-
-    // Create the cros service with the mocks injected.
-    cros_dbus_service_.reset(
-        CrosDBusService::CreateForTesting(
-            mock_bus_,
-            mock_proxy_resolution_service_provider));
+    // Initialize the cros service with the mocks injected.
+    CrosDBusService::InitializeForTesting(
+        mock_bus_, mock_proxy_resolution_service_provider);
   }
 
   virtual void TearDown() {
+    // Shutdown the cros service.
+    CrosDBusService::Shutdown();
+
     // Shutdown the bus.
     mock_bus_->ShutdownAndBlock();
   }
@@ -79,14 +79,12 @@ class CrosDBusServiceTest : public testing::Test {
  protected:
   scoped_refptr<dbus::MockBus> mock_bus_;
   scoped_refptr<dbus::MockExportedObject> mock_exported_object_;
-  scoped_ptr<CrosDBusService> cros_dbus_service_;
 };
 
 TEST_F(CrosDBusServiceTest, Start) {
   // Simply start the service and see if mock expectations are met:
   // - The service object is exported by GetExportedObject()
   // - The proxy resolution service is started.
-  cros_dbus_service_->Start();
 }
 
 }  // namespace chromeos