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

chromeos/dbus/shill_network_client_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 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,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kConnectedProperty);
   dbus::AppendBasicTypeValueDataAsVariant(&writer, kConnected);
 
   // Set expectations.
   client_->SetPropertyChangedHandler(dbus::ObjectPath(kExampleNetworkPath),
                                      base::Bind(&ExpectPropertyChanged,
                                                 flimflam::kConnectedProperty,
                                                 &kConnected));
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
   // Reset the handler.
   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;
   const uint32 kWifiChannel = 1;
   const bool kConnected = true;
 
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(NULL);
@@ skipping 45 matching lines @@
   PrepareForMethodCall(flimflam::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   client_->GetProperties(dbus::ObjectPath(kExampleNetworkPath),
                          base::Bind(&ExpectDictionaryValueResult, &value));
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
-TEST_F(FlimflamNetworkClientTest, CallGetPropertiesAndBlock) {
+TEST_F(ShillNetworkClientTest, CallGetPropertiesAndBlock) {
   const char kName[] = "name";
 
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(NULL);
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(flimflam::kNameProperty);
@@ skipping 13 matching lines @@
   // Call method.
   scoped_ptr<base::DictionaryValue> result(
       client_->CallGetPropertiesAndBlock(
           dbus::ObjectPath(kExampleNetworkPath)));
 
   ASSERT_TRUE(result.get());
   EXPECT_TRUE(result->Equals(&value));
 }
 
 }  // namespace chromeos