| Index: chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h
|
| diff --git a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h b/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h
|
| index ac53b1433c6f2f41bd8c3bae8c5fea45dec7335a..37b7ce96a539e8f96eca6e653ba946f5e401fcc5 100644
|
| --- a/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h
|
| +++ b/chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h
|
| @@ -26,6 +26,7 @@ class MockBluetoothNodeClient;
|
| class MockCashewClient;
|
| class MockCrosDisksClient;
|
| class MockCryptohomeClient;
|
| +class MockFlimflamIPConfigClient;
|
| class MockFlimflamNetworkClient;
|
| class MockImageBurnerClient;
|
| class MockIntrospectableClient;
|
| @@ -51,6 +52,7 @@ class MockDBusThreadManager : public DBusThreadManager {
|
| MOCK_METHOD0(GetCashewClient, CashewClient*(void));
|
| MOCK_METHOD0(GetCrosDisksClient, CrosDisksClient*(void));
|
| MOCK_METHOD0(GetCryptohomeClient, CryptohomeClient*(void));
|
| + MOCK_METHOD0(GetFlimflamIPConfigClient, FlimflamIPConfigClient*(void));
|
| MOCK_METHOD0(GetFlimflamNetworkClient, FlimflamNetworkClient*(void));
|
| MOCK_METHOD0(GetImageBurnerClient, ImageBurnerClient*(void));
|
| MOCK_METHOD0(GetIntrospectableClient, IntrospectableClient*(void));
|
| @@ -83,6 +85,9 @@ class MockDBusThreadManager : public DBusThreadManager {
|
| MockCryptohomeClient* mock_cryptohome_client() {
|
| return mock_cryptohome_client_.get();
|
| }
|
| + MockFlimflamIPConfigClient* mock_flimflam_ipconfig_client() {
|
| + return mock_flimflam_ipconfig_client_.get();
|
| + }
|
| MockFlimflamNetworkClient* mock_flimflam_network_client() {
|
| return mock_flimflam_network_client_.get();
|
| }
|
| @@ -114,6 +119,7 @@ class MockDBusThreadManager : public DBusThreadManager {
|
| scoped_ptr<MockCashewClient> mock_cashew_client_;
|
| scoped_ptr<MockCrosDisksClient> mock_cros_disks_client_;
|
| scoped_ptr<MockCryptohomeClient> mock_cryptohome_client_;
|
| + scoped_ptr<MockFlimflamIPConfigClient> mock_flimflam_ipconfig_client_;
|
| scoped_ptr<MockFlimflamNetworkClient> mock_flimflam_network_client_;
|
| scoped_ptr<MockImageBurnerClient> mock_image_burner_client_;
|
| scoped_ptr<MockIntrospectableClient> mock_introspectable_client_;
|
|
|