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

Side by Side Diff: chromeos/dbus/mock_shill_network_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
« no previous file with comments | « chromeos/dbus/mock_shill_manager_client.cc ('k') | chromeos/dbus/mock_shill_network_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_NETWORK_CLIENT_H_ 5 #ifndef CHROMEOS_DBUS_MOCK_SHILL_NETWORK_CLIENT_H_
6 #define CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_ 6 #define CHROMEOS_DBUS_MOCK_SHILL_NETWORK_CLIENT_H_
7 7
8 #include "chromeos/dbus/flimflam_network_client.h" 8 #include "chromeos/dbus/shill_network_client.h"
9 #include "dbus/object_path.h" 9 #include "dbus/object_path.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 13
14 class MockFlimflamNetworkClient : public FlimflamNetworkClient { 14 class MockShillNetworkClient : public ShillNetworkClient {
15 public: 15 public:
16 MockFlimflamNetworkClient(); 16 MockShillNetworkClient();
17 virtual ~MockFlimflamNetworkClient(); 17 virtual ~MockShillNetworkClient();
18 18
19 MOCK_METHOD2(SetPropertyChangedHandler, 19 MOCK_METHOD2(SetPropertyChangedHandler,
20 void(const dbus::ObjectPath& network_path, 20 void(const dbus::ObjectPath& network_path,
21 const PropertyChangedHandler& handler)); 21 const PropertyChangedHandler& handler));
22 MOCK_METHOD1(ResetPropertyChangedHandler, 22 MOCK_METHOD1(ResetPropertyChangedHandler,
23 void(const dbus::ObjectPath& network_path)); 23 void(const dbus::ObjectPath& network_path));
24 MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& network_path, 24 MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& network_path,
25 const DictionaryValueCallback& callback)); 25 const DictionaryValueCallback& callback));
26 MOCK_METHOD1(CallGetPropertiesAndBlock, 26 MOCK_METHOD1(CallGetPropertiesAndBlock,
27 base::DictionaryValue*(const dbus::ObjectPath& network_path)); 27 base::DictionaryValue*(const dbus::ObjectPath& network_path));
28 }; 28 };
29 29
30 } // namespace chromeos 30 } // namespace chromeos
31 31
32 #endif // CHROMEOS_DBUS_MOCK_FLIMFLAM_NETWORK_CLIENT_H_ 32 #endif // CHROMEOS_DBUS_MOCK_SHILL_NETWORK_CLIENT_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/mock_shill_manager_client.cc ('k') | chromeos/dbus/mock_shill_network_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698