Split construction and initialization of DBus clients.

Before, each Client had a Create function which constructed an instance of the client and initialized it (with a dbus::Bus*).

To make the Clients separately replaceable in the DBusThreadManager, it's necessary to separate the construction of the Clients from their initialization.

This CL, splits each Create function into Create (which only calls the constructor of either the real Impl or the Stub) and Init(dbus::Bus*).
This is a pure refactoring.

BUG=275286

Review URL: https://chromiumcodereview.appspot.com/23119006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219775 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/chromeos/dbus/sms_client.cc b/chromeos/dbus/sms_client.cc
index ee6fb04..cd867a5 100644
--- a/chromeos/dbus/sms_client.cc
+++ b/chromeos/dbus/sms_client.cc
@@ -31,7 +31,8 @@ namespace {
 // DBusThreadManager instance.
 class SMSClientImpl : public SMSClient {
  public:
-  explicit SMSClientImpl(dbus::Bus* bus) : bus_(bus), weak_ptr_factory_(this) {}
+  SMSClientImpl() : bus_(NULL), weak_ptr_factory_(this) {}
+
   virtual ~SMSClientImpl() {}
 
   // Calls GetAll method.  |callback| is called after the method call succeeds.
@@ -49,6 +50,11 @@ class SMSClientImpl : public SMSClient {
                                   callback));
   }
 
+ protected:
+  virtual void Init(dbus::Bus* bus) OVERRIDE {
+    bus_ = bus;
+  }
+
  private:
   // Handles responses of GetAll method calls.
   void OnGetAll(const GetAllCallback& callback, dbus::Response* response) {
@@ -84,6 +90,8 @@ class SMSClientStubImpl : public SMSClient {
   SMSClientStubImpl() : weak_ptr_factory_(this) {}
   virtual ~SMSClientStubImpl() {}
 
+  virtual void Init(dbus::Bus* bus) OVERRIDE {}
+
   virtual void GetAll(const std::string& service_name,
                       const dbus::ObjectPath& object_path,
                       const GetAllCallback& callback) OVERRIDE {
@@ -131,10 +139,9 @@ SMSClient::~SMSClient() {}
 
 
 // static
-SMSClient* SMSClient::Create(DBusClientImplementationType type,
-                             dbus::Bus* bus) {
+SMSClient* SMSClient::Create(DBusClientImplementationType type) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) {
-    return new SMSClientImpl(bus);
+    return new SMSClientImpl();
   }
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new SMSClientStubImpl();