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

chromeos/network/network_sms_handler.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 "chromeos/network/network_sms_handler.h"
 
 #include <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/flimflam_device_client.h"
-#include "chromeos/dbus/flimflam_manager_client.h"
+#include "chromeos/dbus/shill_device_client.h"
+#include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/sms_client.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 // Not exposed/exported.
 namespace {
 const char kSmscKey[] = "smsc";
 const char kValidityKey[] = "validity";
@@ skipping 306 matching lines @@
 
 NetworkSmsHandler::~NetworkSmsHandler() {
 }
 
 void NetworkSmsHandler::Init() {
   // TODO(stevenjb): This code needs to monitor changes to Manager.Network
   // so that devices added after Init() is called get added to device_handlers_.
   // See: crbug.com/133416.
 
   // Request network manager properties so that we can get the list of devices.
-  DBusThreadManager::Get()->GetFlimflamManagerClient()->GetProperties(
+  DBusThreadManager::Get()->GetShillManagerClient()->GetProperties(
       base::Bind(&NetworkSmsHandler::ManagerPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NetworkSmsHandler::RequestUpdate() {
   for (ScopedVector<NetworkSmsDeviceHandler>::iterator iter =
            device_handlers_.begin(); iter != device_handlers_.end(); ++iter) {
     (*iter)->RequestUpdate();
   }
 }
@@ skipping 26 matching lines @@
     return;
   }
   const base::ListValue* devices = static_cast<const base::ListValue*>(value);
   for (base::ListValue::const_iterator iter = devices->begin();
        iter != devices->end(); ++iter) {
     std::string device_path;
     (*iter)->GetAsString(&device_path);
     if (!device_path.empty()) {
       // Request device properties.
       VLOG(1) << "GetDeviceProperties: " << device_path;
-      DBusThreadManager::Get()->GetFlimflamDeviceClient()->GetProperties(
+      DBusThreadManager::Get()->GetShillDeviceClient()->GetProperties(
           dbus::ObjectPath(device_path),
           base::Bind(&NetworkSmsHandler::DevicePropertiesCallback,
                      weak_ptr_factory_.GetWeakPtr(),
                      device_path));
     }
   }
 }
 
 void NetworkSmsHandler::DevicePropertiesCallback(
     const std::string& device_path,
@@ skipping 35 matching lines @@
             this, dbus_connection, object_path));
   } else {
     device_handlers_.push_back(
         new ModemManagerNetworkSmsDeviceHandler(
             this, dbus_connection, object_path));
   }
 }
 
 
 }  // namespace chromeos