Remove fake client creation from DBusClients' Create() functions.

chromeos/dbus/nfc_client_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/nfc_adapter_client.h"
 #include "chromeos/dbus/nfc_client_helpers.h"
 #include "chromeos/dbus/nfc_device_client.h"
 #include "chromeos/dbus/nfc_manager_client.h"
@@ skipping 183 matching lines @@
         .WillRepeatedly(Return(mock_tag0_proxy_.get()));
     EXPECT_CALL(*mock_bus_.get(),
                 GetObjectProxy(nfc_tag::kNfcTagServiceName,
                                dbus::ObjectPath(kTestTagPath1)))
         .WillRepeatedly(Return(mock_tag1_proxy_.get()));
 
     // ShutdownAndBlock will be called in TearDown.
     EXPECT_CALL(*mock_bus_.get(), ShutdownAndBlock()).WillOnce(Return());
 
     // Create the clients.
-    manager_client_.reset(
-        NfcManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION));
-    adapter_client_.reset(
-        NfcAdapterClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
-                                 manager_client_.get()));
-    device_client_.reset(
-        NfcDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
-                                adapter_client_.get()));
-    tag_client_.reset(
-        NfcTagClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
-                             adapter_client_.get()));
+    manager_client_.reset(NfcManagerClient::Create());
+    adapter_client_.reset(NfcAdapterClient::Create(manager_client_.get()));
+    device_client_.reset(NfcDeviceClient::Create(adapter_client_.get()));
+    tag_client_.reset(NfcTagClient::Create(adapter_client_.get()));
     record_client_.reset(
-        NfcRecordClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
-                               device_client_.get(), tag_client_.get()));
+        NfcRecordClient::Create(device_client_.get(), tag_client_.get()));
     manager_client_->Init(mock_bus_.get());
     adapter_client_->Init(mock_bus_.get());
     device_client_->Init(mock_bus_.get());
     tag_client_->Init(mock_bus_.get());
     record_client_->Init(mock_bus_.get());
     manager_client_->AddObserver(&mock_manager_observer_);
     adapter_client_->AddObserver(&mock_adapter_observer_);
     device_client_->AddObserver(&mock_device_observer_);
     tag_client_->AddObserver(&mock_tag_observer_);
     record_client_->AddObserver(&mock_record_observer_);
@@ skipping 652 matching lines @@
   EXPECT_CALL(mock_tag_observer_,
               TagRemoved(dbus::ObjectPath(kTestTagPath1)));
   EXPECT_CALL(mock_record_observer_,
               RecordRemoved(dbus::ObjectPath(kTestRecordPath2)));
   EXPECT_CALL(mock_record_observer_,
               RecordRemoved(dbus::ObjectPath(kTestRecordPath3)));
   SimulateAdaptersChanged(object_paths);
 }
 
 }  // namespace chromeos