Merge FavoriteState into NetworkState

chrome/browser/chromeos/net/proxy_config_handler.h

Index: chrome/browser/chromeos/net/proxy_config_handler.h
diff --git a/chrome/browser/chromeos/net/proxy_config_handler.h b/chrome/browser/chromeos/net/proxy_config_handler.h
index 5aae4d63cc433384bddf062e56f182e9a5e5d76b..e44dfbd2738340b82853b70c912b42353a95cabe 100644
--- a/chrome/browser/chromeos/net/proxy_config_handler.h
+++ b/chrome/browser/chromeos/net/proxy_config_handler.h
@@ -18,7 +18,7 @@ class PrefRegistrySyncable;
 
 namespace chromeos {
 
-class FavoriteState;
+class NetworkState;
 
 namespace proxy_config {
 
@@ -26,14 +26,14 @@ namespace proxy_config {
 // |network|. If |profile_prefs| is NULL, then only shared settings (and device
 // policy) are respected. This is e.g. the case for the signin screen and the
 // system request context.
-scoped_ptr<ProxyConfigDictionary> GetProxyConfigForFavoriteNetwork(
+scoped_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(
     const PrefService* profile_prefs,
     const PrefService* local_state_prefs,
-    const FavoriteState& network,
+    const NetworkState& network,
     onc::ONCSource* onc_source);
 
-void SetProxyConfigForFavoriteNetwork(const ProxyConfigDictionary& proxy_config,
-                                      const FavoriteState& network);
+void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config,
+                              const NetworkState& network);
 
 void RegisterPrefs(PrefRegistrySimple* registry);