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

chromeos/dbus/shill_network_client_unittest.cc

Index: chromeos/dbus/shill_network_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_network_client_unittest.cc b/chromeos/dbus/shill_network_client_unittest.cc
similarity index 90%
rename from chromeos/dbus/flimflam_network_client_unittest.cc
rename to chromeos/dbus/shill_network_client_unittest.cc
index 566744a686863a976c233f3310f49f717f2f61e4..417d2586e462df5e8363c6f7fb8073aeaa165f03 100644
--- a/chromeos/dbus/flimflam_network_client_unittest.cc
+++ b/chromeos/dbus/shill_network_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_network_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_network_client.h"
 #include "dbus/message.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -19,32 +19,32 @@ const char kExampleNetworkPath[] = "/foo/bar";
 
 }  // namespace
 
-class FlimflamNetworkClientTest : public FlimflamClientUnittestBase {
+class ShillNetworkClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamNetworkClientTest()
-      : FlimflamClientUnittestBase(
+  ShillNetworkClientTest()
+      : ShillClientUnittestBase(
           flimflam::kFlimflamNetworkInterface,
           dbus::ObjectPath(kExampleNetworkPath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamNetworkClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillNetworkClient::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<FlimflamNetworkClient> client_;
+  scoped_ptr<ShillNetworkClient> client_;
 };
 
-TEST_F(FlimflamNetworkClientTest, PropertyChanged) {
+TEST_F(ShillNetworkClientTest, PropertyChanged) {
   // Create a signal.
   const base::FundamentalValue kConnected(true);
   dbus::Signal signal(flimflam::kFlimflamNetworkInterface,
@@ -65,7 +65,7 @@ TEST_F(FlimflamNetworkClientTest, PropertyChanged) {
   client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleNetworkPath));
 }
 
-TEST_F(FlimflamNetworkClientTest, GetProperties) {
+TEST_F(ShillNetworkClientTest, GetProperties) {
   const char kAddress[] = "address";
   const char kName[] = "name";
   const uint8 kSignalStrength = 1;
@@ -131,7 +131,7 @@ TEST_F(FlimflamNetworkClientTest, GetProperties) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamNetworkClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillNetworkClientTest, CallGetPropertiesAndBlock) {
   const char kName[] = "name";
 
   // Create response.