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

chrome/browser/chromeos/cros/sms_watcher.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 "chrome/browser/chromeos/cros/sms_watcher.h"
 
 #include <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/flimflam_device_client.h"
+#include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/sms_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 int decode_bcd(const char *s) {
@@ skipping 331 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ModemManager1Watcher);
 };
 
 }  // namespace
 
 SMSWatcher::SMSWatcher(const std::string& modem_device_path,
                        MonitorSMSCallback callback)
     : weak_ptr_factory_(this),
       device_path_(modem_device_path),
       callback_(callback) {
-  DBusThreadManager::Get()->GetFlimflamDeviceClient()->GetProperties(
+  DBusThreadManager::Get()->GetShillDeviceClient()->GetProperties(
       dbus::ObjectPath(modem_device_path),
       base::Bind(&SMSWatcher::DevicePropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 SMSWatcher::~SMSWatcher() {
 }
 
 void SMSWatcher::DevicePropertiesCallback(
     DBusMethodCallStatus call_status,
@@ skipping 22 matching lines @@
         new ModemManager1Watcher(device_path_, callback_, dbus_connection,
                                  dbus::ObjectPath(object_path_string)));
   } else {
     watcher_.reset(
         new GsmWatcher(device_path_, callback_, dbus_connection,
                        dbus::ObjectPath(object_path_string)));
   }
 }
 
 }  // namespace chromeos