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

chromeos/dbus/shill_manager_client_unittest.cc

Index: chromeos/dbus/shill_manager_client_unittest.cc
diff --git a/chromeos/dbus/flimflam_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc
similarity index 91%
rename from chromeos/dbus/flimflam_manager_client_unittest.cc
rename to chromeos/dbus/shill_manager_client_unittest.cc
index d50920e22b667588c8fec5ed4f84ede331238d00..9d37aecf76125618cf02f66edef3fbba2c9b65a7 100644
--- a/chromeos/dbus/flimflam_manager_client_unittest.cc
+++ b/chromeos/dbus/shill_manager_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_manager_client.h"
+#include "chromeos/dbus/shill_client_unittest_base.h"
+#include "chromeos/dbus/shill_manager_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
@@ -96,32 +96,32 @@ base::DictionaryValue* CreateExampleProperties() {
 
 }  // namespace
 
-class FlimflamManagerClientTest : public FlimflamClientUnittestBase {
+class ShillManagerClientTest : public ShillClientUnittestBase {
  public:
-  FlimflamManagerClientTest()
-      : FlimflamClientUnittestBase(
+  ShillManagerClientTest()
+      : ShillClientUnittestBase(
           flimflam::kFlimflamManagerInterface,
           dbus::ObjectPath(flimflam::kFlimflamServicePath)) {
   }
 
   virtual void SetUp() {
-    FlimflamClientUnittestBase::SetUp();
+    ShillClientUnittestBase::SetUp();
     // Create a client with the mock bus.
-    client_.reset(FlimflamManagerClient::Create(REAL_DBUS_CLIENT_IMPLEMENTATION,
+    client_.reset(ShillManagerClient::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<FlimflamManagerClient> client_;
+  scoped_ptr<ShillManagerClient> client_;
 };
 
-TEST_F(FlimflamManagerClientTest, PropertyChanged) {
+TEST_F(ShillManagerClientTest, PropertyChanged) {
   // Create a signal.
   base::FundamentalValue kOfflineMode(true);
   dbus::Signal signal(flimflam::kFlimflamManagerInterface,
@@ -141,7 +141,7 @@ TEST_F(FlimflamManagerClientTest, PropertyChanged) {
   client_->ResetPropertyChangedHandler();
 }
 
-TEST_F(FlimflamManagerClientTest, GetProperties) {
+TEST_F(ShillManagerClientTest, GetProperties) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
@@ -169,7 +169,7 @@ TEST_F(FlimflamManagerClientTest, GetProperties) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillManagerClientTest, CallGetPropertiesAndBlock) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
@@ -196,7 +196,7 @@ TEST_F(FlimflamManagerClientTest, CallGetPropertiesAndBlock) {
   EXPECT_TRUE(value.Equals(result.get()));
 }
 
-TEST_F(FlimflamManagerClientTest, SetProperty) {
+TEST_F(ShillManagerClientTest, SetProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
@@ -214,7 +214,7 @@ TEST_F(FlimflamManagerClientTest, SetProperty) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, RequestScan) {
+TEST_F(ShillManagerClientTest, RequestScan) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
@@ -227,7 +227,7 @@ TEST_F(FlimflamManagerClientTest, RequestScan) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, EnableTechnology) {
+TEST_F(ShillManagerClientTest, EnableTechnology) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
@@ -241,7 +241,7 @@ TEST_F(FlimflamManagerClientTest, EnableTechnology) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, DisableTechnology) {
+TEST_F(ShillManagerClientTest, DisableTechnology) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
@@ -255,7 +255,7 @@ TEST_F(FlimflamManagerClientTest, DisableTechnology) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, ConfigureService) {
+TEST_F(ShillManagerClientTest, ConfigureService) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Create the argument dictionary.
@@ -270,7 +270,7 @@ TEST_F(FlimflamManagerClientTest, ConfigureService) {
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamManagerClientTest, GetService) {
+TEST_F(ShillManagerClientTest, GetService) {
   // Create response.
   const dbus::ObjectPath object_path("/");
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());