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

chromeos/dbus/shill_ipconfig_client_unittest.cc

Index: chromeos/dbus/shill_ipconfig_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_ipconfig_client_unittest.cc b/chromeos/dbus/shill_ipconfig_client_unittest.cc
similarity index 89%
rename from chromeos/dbus/flimflam_ipconfig_client_unittest.cc
rename to chromeos/dbus/shill_ipconfig_client_unittest.cc
index 1ba8f00396821fe7bd0b6f74d4a382fa527dfec8..60bca254b9b9af44b3c44be5f07a4abdc77e7819 100644
--- a/chromeos/dbus/flimflam_ipconfig_client_unittest.cc
+++ b/chromeos/dbus/shill_ipconfig_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_ipconfig_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_ipconfig_client.h"
 #include "dbus/message.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -19,32 +19,32 @@ const char kExampleIPConfigPath[] = "/foo/bar";
 
 }  // namespace
 
-class FlimflamIPConfigClientTest : public FlimflamClientUnittestBase {
+class ShillIPConfigClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamIPConfigClientTest()
-      : FlimflamClientUnittestBase(
+  ShillIPConfigClientTest()
+      : ShillClientUnittestBase(
           flimflam::kFlimflamIPConfigInterface,
           dbus::ObjectPath(kExampleIPConfigPath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamIPConfigClient::Create(
+    client_.reset(ShillIPConfigClient::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<FlimflamIPConfigClient> client_;
+  scoped_ptr<ShillIPConfigClient> client_;
 };
 
-TEST_F(FlimflamIPConfigClientTest, PropertyChanged) {
+TEST_F(ShillIPConfigClientTest, PropertyChanged) {
   // Create a signal.
   const base::FundamentalValue kConnected(true);
   dbus::Signal signal(flimflam::kFlimflamIPConfigInterface,
@@ -65,7 +65,7 @@ TEST_F(FlimflamIPConfigClientTest, PropertyChanged) {
   client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleIPConfigPath));
 }
 
-TEST_F(FlimflamIPConfigClientTest, GetProperties) {
+TEST_F(ShillIPConfigClientTest, GetProperties) {
   const char kAddress[] = "address";
   const int32 kMtu = 68;
 
@@ -105,7 +105,7 @@ TEST_F(FlimflamIPConfigClientTest, GetProperties) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamIPConfigClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillIPConfigClientTest, CallGetPropertiesAndBlock) {
   const char kAddress[] = "address";
   const int32 kMtu = 68;
 
@@ -146,7 +146,7 @@ TEST_F(FlimflamIPConfigClientTest, CallGetPropertiesAndBlock) {
   EXPECT_TRUE(result->Equals(&value));
 }
 
-TEST_F(FlimflamIPConfigClientTest, SetProperty) {
+TEST_F(ShillIPConfigClientTest, SetProperty) {
   const char kAddress[] = "address";
 
   // Create response.
@@ -168,7 +168,7 @@ TEST_F(FlimflamIPConfigClientTest, SetProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamIPConfigClientTest, ClearProperty) {
+TEST_F(ShillIPConfigClientTest, ClearProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -185,7 +185,7 @@ TEST_F(FlimflamIPConfigClientTest, ClearProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamIPConfigClientTest, Remove) {
+TEST_F(ShillIPConfigClientTest, Remove) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -201,7 +201,7 @@ TEST_F(FlimflamIPConfigClientTest, Remove) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamIPConfigClientTest, CallRemoveAndBlock) {
+TEST_F(ShillIPConfigClientTest, CallRemoveAndBlock) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());