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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/mock_shill_device_client.h
diff --git a/chromeos/dbus/mock_flimflam_device_client.h b/chromeos/dbus/mock_shill_device_client.h
similarity index 90%
rename from chromeos/dbus/mock_flimflam_device_client.h
rename to chromeos/dbus/mock_shill_device_client.h
index 6fb2170bcb2358b7456e6e6bad3e05a890af8831..3110ee5352df29f2656629879cd16c248df1bafd 100644
--- a/chromeos/dbus/mock_flimflam_device_client.h
+++ b/chromeos/dbus/mock_shill_device_client.h
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMEOS_DBUS_MOCK_FLIMFLAM_DEVICE_CLIENT_H_
-#define CHROMEOS_DBUS_MOCK_FLIMFLAM_DEVICE_CLIENT_H_
+#ifndef CHROMEOS_DBUS_MOCK_SHILL_DEVICE_CLIENT_H_
+#define CHROMEOS_DBUS_MOCK_SHILL_DEVICE_CLIENT_H_
#include "base/values.h"
-#include "chromeos/dbus/flimflam_device_client.h"
+#include "chromeos/dbus/shill_device_client.h"
#include "dbus/object_path.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
-class MockFlimflamDeviceClient : public FlimflamDeviceClient {
+class MockShillDeviceClient : public ShillDeviceClient {
public:
- MockFlimflamDeviceClient();
- virtual ~MockFlimflamDeviceClient();
+ MockShillDeviceClient();
+ virtual ~MockShillDeviceClient();
MOCK_METHOD2(SetPropertyChangedHandler,
void(const dbus::ObjectPath& device_path,
@@ -68,4 +68,4 @@ class MockFlimflamDeviceClient : public FlimflamDeviceClient {
} // namespace chromeos
-#endif // CHROMEOS_DBUS_MOCK_FLIMFLAM_DEVICE_CLIENT_H_
+#endif // CHROMEOS_DBUS_MOCK_SHILL_DEVICE_CLIENT_H_
« 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