| Index: chrome/browser/chromeos/dbus/cros_dbus_service.h
|
| diff --git a/chrome/browser/chromeos/dbus/cros_dbus_service.h b/chrome/browser/chromeos/dbus/cros_dbus_service.h
|
| index fdef812092709cd82f1219ef2d1249b74fd4af96..65e2f45d4995aaff354b25044a5f13bf3f2711d1 100644
|
| --- a/chrome/browser/chromeos/dbus/cros_dbus_service.h
|
| +++ b/chrome/browser/chromeos/dbus/cros_dbus_service.h
|
| @@ -45,19 +45,19 @@ class CrosDBusService {
|
| virtual ~ServiceProviderInterface();
|
| };
|
|
|
| - virtual ~CrosDBusService();
|
| -
|
| - // Starts the D-Bus service.
|
| - virtual void Start() = 0;
|
| + // Initializes the global instance.
|
| + static void Initialize();
|
| + // Destroys the global instance.
|
| + static void Shutdown();
|
|
|
| - // Creates the instance.
|
| - static CrosDBusService* Create(dbus::Bus* bus);
|
| + protected:
|
| + virtual ~CrosDBusService();
|
|
|
| private:
|
| - // Creates the instance for testing. Takes the ownership of
|
| + // Initializes the global instance for testing. Takes the ownership of
|
| // |proxy_resolution_service|.
|
| friend class CrosDBusServiceTest;
|
| - static CrosDBusService* CreateForTesting(
|
| + static void InitializeForTesting(
|
| dbus::Bus* bus,
|
| ServiceProviderInterface* proxy_resolution_service);
|
| };
|
|
|