Renaming instances of "flimflam" with "shill", now that we're only

chromeos/dbus/shill_device_client_unittest.cc

Index: chromeos/dbus/shill_device_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_device_client_unittest.cc b/chromeos/dbus/shill_device_client_unittest.cc
similarity index 91%
rename from chromeos/dbus/flimflam_device_client_unittest.cc
rename to chromeos/dbus/shill_device_client_unittest.cc
index 4ef5e68f001cab1bde194d10f90706b7b6ae8b7b..9ecf5fc3e1528a23b698dfe2fce02469332e236a 100644
--- a/chromeos/dbus/flimflam_device_client_unittest.cc
+++ b/chromeos/dbus/shill_device_client_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "base/bind.h"
 #include "base/values.h"
-#include "chromeos/dbus/flimflam_client_unittest_base.h"
-#include "chromeos/dbus/flimflam_device_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_device_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
@@ -46,31 +46,31 @@ void ExpectTwoStringArguments(const std::string& expected_string1,
 
 }  // namespace
 
-class FlimflamDeviceClientTest : public FlimflamClientUnittestBase {
+class ShillDeviceClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamDeviceClientTest()
-      : FlimflamClientUnittestBase(flimflam::kFlimflamDeviceInterface,
+  ShillDeviceClientTest()
+      : ShillClientUnittestBase(flimflam::kFlimflamDeviceInterface,
                                    dbus::ObjectPath(kExampleDevicePath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillDeviceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
                                                mock_bus_));
     // Run the message loop to run the signal connection result callback.
     message_loop_.RunAllPending();
   }
 
   virtual void TearDown() {
-    FlimflamClientUnittestBase::TearDown();
+    ShillClientUnittestBase::TearDown();
   }
 
  protected:
-  scoped_ptr<FlimflamDeviceClient> client_;
+  scoped_ptr<ShillDeviceClient> client_;
 };
 
-TEST_F(FlimflamDeviceClientTest, PropertyChanged) {
+TEST_F(ShillDeviceClientTest, PropertyChanged) {
   const bool kValue = true;
   // Create a signal.
   dbus::Signal signal(flimflam::kFlimflamDeviceInterface,
@@ -93,7 +93,7 @@ TEST_F(FlimflamDeviceClientTest, PropertyChanged) {
   client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleDevicePath));
 }
 
-TEST_F(FlimflamDeviceClientTest, GetProperties) {
+TEST_F(ShillDeviceClientTest, GetProperties) {
   const bool kValue = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -121,7 +121,7 @@ TEST_F(FlimflamDeviceClientTest, GetProperties) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillDeviceClientTest, CallGetPropertiesAndBlock) {
   const bool kValue = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -149,7 +149,7 @@ TEST_F(FlimflamDeviceClientTest, CallGetPropertiesAndBlock) {
   EXPECT_TRUE(result->Equals(&value));
 }
 
-TEST_F(FlimflamDeviceClientTest, ProposeScan) {
+TEST_F(ShillDeviceClientTest, ProposeScan) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -164,7 +164,7 @@ TEST_F(FlimflamDeviceClientTest, ProposeScan) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, SetProperty) {
+TEST_F(ShillDeviceClientTest, SetProperty) {
   const bool kValue = true;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -185,7 +185,7 @@ TEST_F(FlimflamDeviceClientTest, SetProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, ClearProperty) {
+TEST_F(ShillDeviceClientTest, ClearProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -202,7 +202,7 @@ TEST_F(FlimflamDeviceClientTest, ClearProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, AddIPConfig) {
+TEST_F(ShillDeviceClientTest, AddIPConfig) {
   const dbus::ObjectPath expected_result("/result/path");
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -221,7 +221,7 @@ TEST_F(FlimflamDeviceClientTest, AddIPConfig) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, CallAddIPConfigAndBlock) {
+TEST_F(ShillDeviceClientTest, CallAddIPConfigAndBlock) {
   const dbus::ObjectPath expected_result("/result/path");
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -238,7 +238,7 @@ TEST_F(FlimflamDeviceClientTest, CallAddIPConfigAndBlock) {
   EXPECT_EQ(expected_result, result);
 }
 
-TEST_F(FlimflamDeviceClientTest, RequirePin) {
+TEST_F(ShillDeviceClientTest, RequirePin) {
   const char kPin[] = "123456";
   const bool kRequired = true;
   // Create response.
@@ -263,7 +263,7 @@ TEST_F(FlimflamDeviceClientTest, RequirePin) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, EnterPin) {
+TEST_F(ShillDeviceClientTest, EnterPin) {
   const char kPin[] = "123456";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -285,7 +285,7 @@ TEST_F(FlimflamDeviceClientTest, EnterPin) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, UnblockPin) {
+TEST_F(ShillDeviceClientTest, UnblockPin) {
   const char kPuk[] = "987654";
   const char kPin[] = "123456";
   // Create response.
@@ -308,7 +308,7 @@ TEST_F(FlimflamDeviceClientTest, UnblockPin) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, ChangePin) {
+TEST_F(ShillDeviceClientTest, ChangePin) {
   const char kOldPin[] = "123456";
   const char kNewPin[] = "234567";
   // Create response.
@@ -333,7 +333,7 @@ TEST_F(FlimflamDeviceClientTest, ChangePin) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamDeviceClientTest, Register) {
+TEST_F(ShillDeviceClientTest, Register) {
   const char kNetworkId[] = "networkid";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());