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

chromeos/dbus/shill_profile_client_unittest.cc

Index: chromeos/dbus/shill_profile_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_profile_client_unittest.cc b/chromeos/dbus/shill_profile_client_unittest.cc
similarity index 88%
rename from chromeos/dbus/flimflam_profile_client_unittest.cc
rename to chromeos/dbus/shill_profile_client_unittest.cc
index e91d7e446c2e7cb6da7e9325e231b1d5b2cca253..898a9615b17bd6313288566c2b54adfd714bd3a2 100644
--- a/chromeos/dbus/flimflam_profile_client_unittest.cc
+++ b/chromeos/dbus/shill_profile_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_profile_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_profile_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
@@ -29,31 +29,31 @@ void AppendVariantOfArrayOfStrings(dbus::MessageWriter* writer,
 
 }  // namespace
 
-class FlimflamProfileClientTest : public FlimflamClientUnittestBase {
+class ShillProfileClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamProfileClientTest()
-      : FlimflamClientUnittestBase(flimflam::kFlimflamProfileInterface,
+  ShillProfileClientTest()
+      : ShillClientUnittestBase(flimflam::kFlimflamProfileInterface,
                                    dbus::ObjectPath(kDefaultProfilePath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamProfileClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillProfileClient::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<FlimflamProfileClient> client_;
+  scoped_ptr<ShillProfileClient> client_;
 };
 
-TEST_F(FlimflamProfileClientTest, PropertyChanged) {
+TEST_F(ShillProfileClientTest, PropertyChanged) {
   // Create a signal.
   dbus::Signal signal(flimflam::kFlimflamProfileInterface,
                       flimflam::kMonitorPropertyChanged);
@@ -77,7 +77,7 @@ TEST_F(FlimflamProfileClientTest, PropertyChanged) {
   client_->ResetPropertyChangedHandler(dbus::ObjectPath(kDefaultProfilePath));
 }
 
-TEST_F(FlimflamProfileClientTest, GetProperties) {
+TEST_F(ShillProfileClientTest, GetProperties) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
@@ -107,7 +107,7 @@ TEST_F(FlimflamProfileClientTest, GetProperties) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamProfileClientTest, GetEntry) {
+TEST_F(ShillProfileClientTest, GetEntry) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
@@ -137,7 +137,7 @@ TEST_F(FlimflamProfileClientTest, GetEntry) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamProfileClientTest, DeleteEntry) {
+TEST_F(ShillProfileClientTest, DeleteEntry) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());