Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: chromeos/dbus/mock_shill_device_client.h

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_DBUS_MOCK_FLIMFLAM_DEVICE_CLIENT_H_ 5 #ifndef CHROMEOS_DBUS_MOCK_SHILL_DEVICE_CLIENT_H_
6 #define CHROMEOS_DBUS_MOCK_FLIMFLAM_DEVICE_CLIENT_H_ 6 #define CHROMEOS_DBUS_MOCK_SHILL_DEVICE_CLIENT_H_
7 7
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chromeos/dbus/flimflam_device_client.h" 9 #include "chromeos/dbus/shill_device_client.h"
10 #include "dbus/object_path.h" 10 #include "dbus/object_path.h"
11 #include "testing/gmock/include/gmock/gmock.h" 11 #include "testing/gmock/include/gmock/gmock.h"
12 12
13 namespace chromeos { 13 namespace chromeos {
14 14
15 class MockFlimflamDeviceClient : public FlimflamDeviceClient { 15 class MockShillDeviceClient : public ShillDeviceClient {
16 public: 16 public:
17 MockFlimflamDeviceClient(); 17 MockShillDeviceClient();
18 virtual ~MockFlimflamDeviceClient(); 18 virtual ~MockShillDeviceClient();
19 19
20 MOCK_METHOD2(SetPropertyChangedHandler, 20 MOCK_METHOD2(SetPropertyChangedHandler,
21 void(const dbus::ObjectPath& device_path, 21 void(const dbus::ObjectPath& device_path,
22 const PropertyChangedHandler& handler)); 22 const PropertyChangedHandler& handler));
23 MOCK_METHOD1(ResetPropertyChangedHandler, 23 MOCK_METHOD1(ResetPropertyChangedHandler,
24 void(const dbus::ObjectPath& device_path)); 24 void(const dbus::ObjectPath& device_path));
25 MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& device_path, 25 MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& device_path,
26 const DictionaryValueCallback& callback)); 26 const DictionaryValueCallback& callback));
27 MOCK_METHOD1(CallGetPropertiesAndBlock, 27 MOCK_METHOD1(CallGetPropertiesAndBlock,
28 base::DictionaryValue*(const dbus::ObjectPath& device_path)); 28 base::DictionaryValue*(const dbus::ObjectPath& device_path));
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 const base::Closure& callback, 61 const base::Closure& callback,
62 const ErrorCallback& error_callback)); 62 const ErrorCallback& error_callback));
63 MOCK_METHOD4(Register, void(const dbus::ObjectPath& device_path, 63 MOCK_METHOD4(Register, void(const dbus::ObjectPath& device_path,
64 const std::string& network_id, 64 const std::string& network_id,
65 const base::Closure& callback, 65 const base::Closure& callback,
66 const ErrorCallback& error_callback)); 66 const ErrorCallback& error_callback));
67 }; 67 };
68 68
69 } // namespace chromeos 69 } // namespace chromeos
70 70
71 #endif // CHROMEOS_DBUS_MOCK_FLIMFLAM_DEVICE_CLIENT_H_ 71 #endif // CHROMEOS_DBUS_MOCK_SHILL_DEVICE_CLIENT_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/mock_flimflam_service_client.cc ('k') | chromeos/dbus/mock_shill_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698