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

chrome/browser/chromeos/cros/cros_network_functions.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_
 
 // This header is introduced to make it easy to switch from chromeos_network.cc
 // to Chrome's own DBus code.  crosbug.com/16557
 // All calls to functions in chromeos_network.h should be made through
@@ skipping 120 matching lines @@
                                    const base::Value& value);
 
 // Deletes a remembered service from a profile.
 void CrosDeleteServiceFromProfile(const std::string& profile_path,
                                   const std::string& service_path);
 
 // Requests an update of the data plans. A callback will be received by any
 // object that invoked MonitorCellularDataPlan when up to date data is ready.
 void CrosRequestCellularDataPlanUpdate(const std::string& modem_service_path);
 
-// Sets up monitoring of the PropertyChanged signal on the flimflam manager.
+// Sets up monitoring of the PropertyChanged signal on the shill manager.
 // The provided |callback| will be called whenever a manager property changes.
 CrosNetworkWatcher* CrosMonitorNetworkManagerProperties(
     const NetworkPropertiesWatcherCallback& callback);
 
 // Similar to MonitorNetworkManagerProperties for a specified network service.
 CrosNetworkWatcher* CrosMonitorNetworkServiceProperties(
     const NetworkPropertiesWatcherCallback& callback,
     const std::string& service_path);
 
 // Similar to MonitorNetworkManagerProperties for a specified network device.
@@ skipping 56 matching lines @@
     const std::string& provider_type,
     const NetworkPropertiesCallback& callback);
 
 // Disconnects from network service asynchronously.
 void CrosRequestNetworkServiceDisconnect(const std::string& service_path);
 
 // Removes an exisiting network service (e.g. after forgetting a VPN).
 void CrosRequestRemoveNetworkService(const std::string& service_path);
 
 // Requests a scan of services of |type|.
-// |type| should be is a string recognized by flimflam's Manager API.
+// |type| should be is a string recognized by shill's Manager API.
 void CrosRequestNetworkScan(const std::string& network_type);
 
 // Requests enabling or disabling a device.
 void CrosRequestNetworkDeviceEnable(const std::string& network_type,
                                     bool enable);
 
 // Enables or disables PIN protection for a SIM card.
 void CrosRequestRequirePin(const std::string& device_path,
                            const std::string& pin,
                            bool enable,
@@ skipping 69 matching lines @@
 // Invalid prefix lengths will return the empty string.
 std::string CrosPrefixLengthToNetmask(int32 prefix_length);
 
 // Converts a |netmask| to a prefixlen. (for IPv4 only)
 // e.g. a |netmask| of 255.255.255.0 is converted to a prefixlen of 24
 int32 CrosNetmaskToPrefixLength(const std::string& netmask);
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_CROS_NETWORK_FUNCTIONS_H_