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

chrome/browser/chromeos/cros/network_library_impl_base.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_NETWORK_LIBRARY_IMPL_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_
 
 #include <list>
 #include <set>
 
@@ skipping 320 matching lines @@
 
   // Calls ForgetNetwork for remembered wifi and virtual networks based on id.
   // When |if_found| is true, then it forgets networks that appear in |ids|.
   // When |if_found| is false, it removes networks that do NOT appear in |ids|.
   // |source| is the import source of the data.
   void ForgetNetworksById(NetworkUIData::ONCSource source,
                           std::set<std::string> ids,
                           bool if_found);
 
   // Checks whether |network| has meanwhile been pruned by ONC policy. If so,
-  // instructs flimflam to remove the network, deletes |network| and returns
+  // instructs shill to remove the network, deletes |network| and returns
   // false.
   bool ValidateRememberedNetwork(Network* network);
 
   // Adds |network| to the remembered networks data structures and returns true
   // if ValidateRememberedNetwork(network) returns true. Returns false
   // otherwise.
   bool ValidateAndAddRememberedNetwork(Network* network);
 
   void DeleteRememberedNetwork(const std::string& service_path);
   void ClearNetworks();
@@ skipping 124 matching lines @@
 
   // Currently not implemented. TODO(stevenjb): implement or eliminate.
   bool offline_mode_;
 
   // List of interfaces for which portal check is enabled.
   std::string check_portal_list_;
 
   // True if access network library is locked.
   bool is_locked_;
 
-  // TPM module user slot and PIN, needed by flimflam to access certificates.
+  // TPM module user slot and PIN, needed by shill to access certificates.
   std::string tpm_slot_;
   std::string tpm_pin_;
 
   // Type of pending SIM operation, SIM_OPERATION_NONE otherwise.
   SimOperationType sim_operation_;
 
  private:
   // List of networks to move to the user profile once logged in.
   std::list<std::string> user_networks_;
 
   // Weak pointer factory for canceling a network change callback.
   base::WeakPtrFactory<NetworkLibraryImplBase> notify_manager_weak_factory_;
 
   // Cellular plan payment time.
   base::Time cellular_plan_payment_time_;
 
   // Temporary connection data for async connect calls.
   ConnectData connect_data_;
 
   // Holds unique id to ONC mapping.
   NetworkOncMap network_onc_map_;
 
   // Keeps track of what networks ONC has configured. This is used to weed out
-  // stray networks that flimflam still has on file, but are not known on the
+  // stray networks that shill still has on file, but are not known on the
   // Chrome side.
   NetworkSourceMap network_source_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImplBase);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_IMPL_BASE_H_