Remove migration code from device proxy settings to per network settings.

Also
- removed the then unused Pref kSettingProxyEverywhere.
- removed some unused debugging code from ProxyConfigServiceImpl.

This shouldn't affect the device proxy policy, as it is still converted to the policy kProxySettings.

BUG=168140
TEST=Ensure that device proxy policy still works for retail mode v1.

Review URL: https://chromiumcodereview.appspot.com/15269004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201330 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 14 deletions

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index 730e003..b66f105 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -27,8 +27,6 @@ namespace chromeos {
 //   thread) to handle proxy from prefs (via PrefProxyConfigTrackerImpl) and
 //   system i.e. network (via shill notifications)
 // - exists one per profile and one per local state
-// - retrieves initial system proxy configuration from cros settings persisted
-//   on chromeos device from chromeos revisions before migration to shill,
 // - persists proxy setting per network in flimflim
 // - provides network stack with latest effective proxy configuration for
 //   currently active network via PrefProxyConfigTrackerImpl's mechanism of
@@ -100,12 +98,6 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
     // ManualProxy.  Returns NULL if scheme is invalid.
     ManualProxy* MapSchemeToProxy(const std::string& scheme);
 
-    // We've migrated device settings to shill, so we only need to
-    // deserialize previously persisted device settings.
-    // Deserializes from signed setting on device as std::string into a
-    // protobuf and then into the config.
-    bool DeserializeForDevice(const std::string& input);
-
     // Serializes config into a ProxyConfigDictionary and then std::string
     // persisted as string property in shill for a network.
     bool SerializeForNetwork(std::string* output);
@@ -227,8 +219,7 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
 
   // Called from OnNetworkManagerChanged and OnNetworkChanged for currently
   // active network, to handle previously active network, new active network,
-  // and if necessary, migrates device settings to shill and/or activates
-  // proxy setting of new network.
+  // and if necessary, activates proxy setting of new network.
   void OnActiveNetworkChanged(NetworkLibrary* cros,
                               const Network* active_network);
 
@@ -278,10 +269,6 @@ class ProxyConfigServiceImpl : public PrefProxyConfigTrackerImpl,
   // Active proxy configuration, which could be from prefs or network.
   net::ProxyConfig active_config_;
 
-  // Proxy config retreived from device, in format generated from
-  // SerializeForNetwork, that can be directly set into shill.
-  std::string device_config_;
-
   // Service path of network whose proxy configuration is being displayed or
   // edited via UI, separate from |active_network_| which may be same or
   // different.