dbus: Remove MockShillDeviceClient and MockShillIPConfigClient

chromeos/dbus/mock_dbus_thread_manager.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 "chromeos/dbus/mock_dbus_thread_manager.h"
 
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/fake_gsm_sms_client.h"
+#include "chromeos/dbus/fake_shill_device_client.h"
+#include "chromeos/dbus/fake_shill_ipconfig_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
-#include "chromeos/dbus/mock_shill_device_client.h"
-#include "chromeos/dbus/mock_shill_ipconfig_client.h"
 #include "chromeos/dbus/mock_shill_manager_client.h"
 #include "chromeos/dbus/mock_shill_profile_client.h"
 #include "chromeos/dbus/mock_shill_service_client.h"
 #include "chromeos/dbus/mock_session_manager_client.h"
 #include "chromeos/dbus/power_policy_controller.h"
 
 using ::testing::AnyNumber;
 using ::testing::Return;
 using ::testing::ReturnNull;
 using ::testing::SetArgumentPointee;
@@ skipping 18 matching lines @@
 
 MockDBusThreadManager::MockDBusThreadManager()
     : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient),
       fake_bluetooth_agent_manager_client_(
           new FakeBluetoothAgentManagerClient),
       fake_bluetooth_device_client_(new FakeBluetoothDeviceClient),
       fake_bluetooth_input_client_(new FakeBluetoothInputClient),
       fake_bluetooth_profile_manager_client_(
           new FakeBluetoothProfileManagerClient),
       fake_gsm_sms_client_(new FakeGsmSMSClient),
+      fake_shill_device_client_(new FakeShillDeviceClient),
+      fake_shill_ipconfig_client_(new FakeShillIPConfigClient),
       mock_cryptohome_client_(new MockCryptohomeClient),
-      mock_shill_device_client_(new MockShillDeviceClient),
-      mock_shill_ipconfig_client_(new MockShillIPConfigClient),
       mock_shill_manager_client_(new MockShillManagerClient),
       mock_shill_profile_client_(new MockShillProfileClient),
       mock_shill_service_client_(new MockShillServiceClient),
       mock_session_manager_client_(new MockSessionManagerClient) {
   EXPECT_CALL(*this, GetCryptohomeClient())
       .WillRepeatedly(Return(mock_cryptohome_client()));
   EXPECT_CALL(*this, GetBluetoothAdapterClient())
       .WillRepeatedly(Return(fake_bluetooth_adapter_client_.get()));
   EXPECT_CALL(*this, GetBluetoothAgentManagerClient())
       .WillRepeatedly(Return(fake_bluetooth_agent_manager_client()));
   EXPECT_CALL(*this, GetBluetoothDeviceClient())
       .WillRepeatedly(Return(fake_bluetooth_device_client_.get()));
   EXPECT_CALL(*this, GetBluetoothInputClient())
       .WillRepeatedly(Return(fake_bluetooth_input_client_.get()));
   EXPECT_CALL(*this, GetBluetoothProfileManagerClient())
       .WillRepeatedly(Return(fake_bluetooth_profile_manager_client()));
   EXPECT_CALL(*this, GetShillDeviceClient())
-      .WillRepeatedly(Return(mock_shill_device_client()));
+      .WillRepeatedly(Return(fake_shill_device_client()));
   EXPECT_CALL(*this, GetShillIPConfigClient())
-      .WillRepeatedly(Return(mock_shill_ipconfig_client()));
+      .WillRepeatedly(Return(fake_shill_ipconfig_client()));
   EXPECT_CALL(*this, GetShillManagerClient())
       .WillRepeatedly(Return(mock_shill_manager_client()));
   EXPECT_CALL(*this, GetShillProfileClient())
       .WillRepeatedly(Return(mock_shill_profile_client()));
   EXPECT_CALL(*this, GetShillServiceClient())
       .WillRepeatedly(Return(mock_shill_service_client()));
   EXPECT_CALL(*this, GetGsmSMSClient())
       .WillRepeatedly(Return(fake_gsm_sms_client()));
   EXPECT_CALL(*this, GetSessionManagerClient())
       .WillRepeatedly(Return(mock_session_manager_client_.get()));
@@ skipping 43 matching lines @@
   observers_.AddObserver(observer);
 }
 
 void MockDBusThreadManager::RemoveObserver(
     DBusThreadManagerObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace chromeos