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

chromeos/dbus/shill_service_client_unittest.cc

Index: chromeos/dbus/shill_service_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_service_client_unittest.cc b/chromeos/dbus/shill_service_client_unittest.cc
similarity index 87%
rename from chromeos/dbus/flimflam_service_client_unittest.cc
rename to chromeos/dbus/shill_service_client_unittest.cc
index fba750a77fb713384742a9420db2e49759b6ab60..20b603cdfaae981c5547d3ede140fad559912624 100644
--- a/chromeos/dbus/flimflam_service_client_unittest.cc
+++ b/chromeos/dbus/shill_service_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_service_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_service_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
@@ -20,31 +20,31 @@ const char kExampleServicePath[] = "/foo/bar";
 
 }  // namespace
 
-class FlimflamServiceClientTest : public FlimflamClientUnittestBase {
+class ShillServiceClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamServiceClientTest()
-      : FlimflamClientUnittestBase(flimflam::kFlimflamServiceInterface,
+  ShillServiceClientTest()
+      : ShillClientUnittestBase(flimflam::kFlimflamServiceInterface,
                                    dbus::ObjectPath(kExampleServicePath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamServiceClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillServiceClient::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<FlimflamServiceClient> client_;
+  scoped_ptr<ShillServiceClient> client_;
 };
 
-TEST_F(FlimflamServiceClientTest, PropertyChanged) {
+TEST_F(ShillServiceClientTest, PropertyChanged) {
   const int kValue = 42;
   // Create a signal.
   dbus::Signal signal(flimflam::kFlimflamServiceInterface,
@@ -67,7 +67,7 @@ TEST_F(FlimflamServiceClientTest, PropertyChanged) {
   client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleServicePath));
 }
 
-TEST_F(FlimflamServiceClientTest, GetProperties) {
+TEST_F(ShillServiceClientTest, GetProperties) {
   const int kValue = 42;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -95,7 +95,7 @@ TEST_F(FlimflamServiceClientTest, GetProperties) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, SetProperty) {
+TEST_F(ShillServiceClientTest, SetProperty) {
   const char kValue[] = "passphrase";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -116,7 +116,7 @@ TEST_F(FlimflamServiceClientTest, SetProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, ClearProperty) {
+TEST_F(ShillServiceClientTest, ClearProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -133,7 +133,7 @@ TEST_F(FlimflamServiceClientTest, ClearProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, Connect) {
+TEST_F(ShillServiceClientTest, Connect) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -153,7 +153,7 @@ TEST_F(FlimflamServiceClientTest, Connect) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, Disconnect) {
+TEST_F(ShillServiceClientTest, Disconnect) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -168,7 +168,7 @@ TEST_F(FlimflamServiceClientTest, Disconnect) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, Remove) {
+TEST_F(ShillServiceClientTest, Remove) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
@@ -183,7 +183,7 @@ TEST_F(FlimflamServiceClientTest, Remove) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, ActivateCellularModem) {
+TEST_F(ShillServiceClientTest, ActivateCellularModem) {
   const char kCarrier[] = "carrier";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
@@ -200,7 +200,7 @@ TEST_F(FlimflamServiceClientTest, ActivateCellularModem) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamServiceClientTest, CallActivateCellularModemAndBlock) {
+TEST_F(ShillServiceClientTest, CallActivateCellularModemAndBlock) {
   const char kCarrier[] = "carrier";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());