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

chrome/browser/chromeos/proxy_config_service_impl.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/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
@@ skipping 374 matching lines @@
     : PrefProxyConfigTrackerImpl(pref_service),
       active_config_state_(ProxyPrefs::CONFIG_UNSET),
       pointer_factory_(this) {
 
   // Register for notifications of UseSharedProxies user preference.
   if (pref_service->FindPreference(prefs::kUseSharedProxies))
     use_shared_proxies_.Init(prefs::kUseSharedProxies, pref_service, this);
 
   FetchProxyPolicy();
 
-  // Register for flimflam network notifications.
+  // Register for shill network notifications.
   NetworkLibrary* network_lib = CrosLibrary::Get()->GetNetworkLibrary();
   OnActiveNetworkChanged(network_lib, network_lib->active_network());
   network_lib->AddNetworkManagerObserver(this);
 }
 
 ProxyConfigServiceImpl::~ProxyConfigServiceImpl() {
   NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
   if (netlib) {
     netlib->RemoveNetworkManagerObserver(this);
     netlib->RemoveObserverForAllNetworks(this);
@@ skipping 187 matching lines @@
       DetermineEffectiveConfig(network, true);
     }
     return;
   }
   PrefProxyConfigTrackerImpl::Observe(type, source, details);
 }
 
 void ProxyConfigServiceImpl::OnUISetProxyConfig() {
   if (current_ui_network_.empty())
     return;
-  // Update config to flimflam.
+  // Update config to shill.
   std::string value;
   if (current_ui_config_.SerializeForNetwork(&value)) {
     VLOG(1) << "Set proxy (mode=" << current_ui_config_.mode
             << ") for " << current_ui_network_;
     current_ui_config_.state = ProxyPrefs::CONFIG_SYSTEM;
     SetProxyConfigForNetwork(current_ui_network_, value, false);
   }
 }
 
 void ProxyConfigServiceImpl::OnActiveNetworkChanged(NetworkLibrary* network_lib,
@@ skipping 34 matching lines @@
 
   VLOG(1) << "New active network: path=" << active_network->service_path()
           << ", name=" << active_network->name()
           << ", profile=" << active_network->profile_type()
           << "," << active_network->profile_path()
           << ", proxy=" << active_network->proxy_config();
 
   // Register observer for new network.
   network_lib->AddNetworkObserver(active_network_, this);
 
-  // If necessary, migrate config to flimflam.
+  // If necessary, migrate config to shill.
   if (active_network->proxy_config().empty() && !device_config_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   } else  {
     // Otherwise, determine and activate possibly new effective proxy config.
     DetermineEffectiveConfig(active_network, true);
   }
 }
 
 void ProxyConfigServiceImpl::SetProxyConfigForNetwork(
@@ skipping 169 matching lines @@
     device_config_.clear();
     return;
   }
   if (!active_network_.empty()) {
     VLOG(1) << "Try migrating device config to " << active_network_;
     SetProxyConfigForNetwork(active_network_, device_config_, true);
   }
 }
 
 }  // namespace chromeos