chromeos: Separate CrosDBusService Initialize/Shutdown from DBusThreadManager

chrome/browser/chromeos/dbus/cros_dbus_service_unittest.cc

 // Copyright (c) 2012 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/cros_dbus_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "dbus/message.h"
@@ skipping 45 matching lines @@
         dbus::ObjectPath(kLibCrosServicePath)))
         .WillOnce(Return(mock_exported_object_.get()));
 
     // Create a mock proxy resolution service.
     MockProxyResolutionService* mock_proxy_resolution_service_provider =
         new MockProxyResolutionService;
 
     // 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();
   }
 
  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