dbus: Remove MockShillDeviceClient and MockShillIPConfigClient

chromeos/dbus/mock_dbus_thread_manager.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
 #define CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_
 
 #include <string>
 
 #include "base/observer_list.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace dbus {
 
 class Bus;
 
 }  // namespace dbus
 
 namespace chromeos {
 
 class DBusThreadManagerObserver;
 class FakeBluetoothAdapterClient;
 class FakeBluetoothAgentManagerClient;
 class FakeBluetoothDeviceClient;
 class FakeBluetoothInputClient;
 class FakeBluetoothProfileManagerClient;
 class FakeGsmSMSClient;
+class FakeShillDeviceClient;
+class FakeShillIPConfigClient;
 class MockCryptohomeClient;
-class MockShillDeviceClient;
-class MockShillIPConfigClient;
+class MockPowerManagerClient;
+class MockSessionManagerClient;
 class MockShillManagerClient;
 class MockShillProfileClient;
 class MockShillServiceClient;
-class MockPowerManagerClient;
-class MockSessionManagerClient;
 
 // This class provides a mock DBusThreadManager with mock clients
 // installed. You can customize the behaviors of mock clients with
 // mock_foo_client() functions.
 // Please avoid adding more GMock in this class. We have an ongoing effort to
 // remove GMock dependency. TODO(haruki): crbug.com/223061.
 class MockDBusThreadManager : public DBusThreadManager {
  public:
   MockDBusThreadManager();
   virtual ~MockDBusThreadManager();
@@ skipping 49 matching lines @@
   }
   FakeBluetoothInputClient* fake_bluetooth_input_client() {
     return fake_bluetooth_input_client_.get();
   }
   FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client() {
     return fake_bluetooth_profile_manager_client_.get();
   }
   FakeGsmSMSClient* fake_gsm_sms_client() {
     return fake_gsm_sms_client_.get();
   }
+  FakeShillDeviceClient* fake_shill_device_client() {
+    return fake_shill_device_client_.get();
+  }
+  FakeShillIPConfigClient* fake_shill_ipconfig_client() {
+    return fake_shill_ipconfig_client_.get();
+  }
   MockCryptohomeClient* mock_cryptohome_client() {
     return mock_cryptohome_client_.get();
   }
-  MockShillDeviceClient* mock_shill_device_client() {
-    return mock_shill_device_client_.get();
-  }
-  MockShillIPConfigClient* mock_shill_ipconfig_client() {
-    return mock_shill_ipconfig_client_.get();
-  }
   MockShillManagerClient* mock_shill_manager_client() {
     return mock_shill_manager_client_.get();
   }
   MockShillProfileClient* mock_shill_profile_client() {
     return mock_shill_profile_client_.get();
   }
   MockShillServiceClient* mock_shill_service_client() {
     return mock_shill_service_client_.get();
   }
   MockSessionManagerClient* mock_session_manager_client() {
     return mock_session_manager_client_.get();
   }
 
  private:
   // Note: Keep this before other members so they can call AddObserver() in
   // their c'tors.
   ObserverList<DBusThreadManagerObserver> observers_;
 
   scoped_ptr<FakeBluetoothAdapterClient> fake_bluetooth_adapter_client_;
   scoped_ptr<FakeBluetoothAgentManagerClient>
       fake_bluetooth_agent_manager_client_;
   scoped_ptr<FakeBluetoothDeviceClient> fake_bluetooth_device_client_;
   scoped_ptr<FakeBluetoothInputClient> fake_bluetooth_input_client_;
   scoped_ptr<FakeBluetoothProfileManagerClient>
       fake_bluetooth_profile_manager_client_;
   scoped_ptr<FakeGsmSMSClient> fake_gsm_sms_client_;
+  scoped_ptr<FakeShillDeviceClient> fake_shill_device_client_;
+  scoped_ptr<FakeShillIPConfigClient> fake_shill_ipconfig_client_;
   scoped_ptr<MockCryptohomeClient> mock_cryptohome_client_;
-  scoped_ptr<MockShillDeviceClient> mock_shill_device_client_;
-  scoped_ptr<MockShillIPConfigClient> mock_shill_ipconfig_client_;
   scoped_ptr<MockShillManagerClient> mock_shill_manager_client_;
   scoped_ptr<MockShillProfileClient> mock_shill_profile_client_;
   scoped_ptr<MockShillServiceClient> mock_shill_service_client_;
   scoped_ptr<MockSessionManagerClient> mock_session_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_H_