Refactor proxy handling for ChromeOS to not go through the CrosSettings interface.

chrome/browser/chromeos/proxy_cros_settings_provider.h

Index: chrome/browser/chromeos/proxy_cros_settings_provider.h
diff --git a/chrome/browser/chromeos/proxy_cros_settings_provider.h b/chrome/browser/chromeos/proxy_cros_settings_provider.h
deleted file mode 100644
index 6f9abf77380298849b5828953fcf2ee429758424..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/proxy_cros_settings_provider.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2011 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_PROXY_CROS_SETTINGS_PROVIDER_H_
-#define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
-#pragma once
-
-#include "base/memory/singleton.h"
-#include "base/values.h"
-#include "chrome/browser/chromeos/cros_settings_provider.h"
-#include "chrome/browser/chromeos/proxy_config_service_impl.h"
-
-class Profile;
-
-namespace chromeos {
-
-class ProxyCrosSettingsProvider : public CrosSettingsProvider {
- public:
-  explicit ProxyCrosSettingsProvider(Profile* profile);
-  // CrosSettingsProvider implementation.
-  virtual bool Get(const std::string& path, Value** out_value) const OVERRIDE;
-  virtual bool HandlesSetting(const std::string& path) const OVERRIDE;
-
-  // Set the current network whose proxy settings will be displayed and possibly
-  // edited on.
-  void SetCurrentNetwork(const std::string& network);
-
-  // Make the active network the current one whose proxy settings will be
-  // displayed and possibly edited on.
-  void MakeActiveNetworkCurrent();
-
- private:
-  // CrosSettingsProvider implementation.
-  virtual void DoSet(const std::string& path, Value* value) OVERRIDE;
-
-  chromeos::ProxyConfigServiceImpl* GetConfigService() const;
-
-  net::ProxyServer CreateProxyServerFromHost(
-      const std::string& host,
-      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
-      net::ProxyServer::Scheme scheme) const;
-
-  net::ProxyServer CreateProxyServerFromPort(
-      uint16 port,
-      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
-      net::ProxyServer::Scheme scheme) const;
-
-  net::ProxyServer CreateProxyServer(
-      std::string host,
-      uint16 port,
-      net::ProxyServer::Scheme scheme) const;
-
-  Value* CreateServerHostValue(
-      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
-
-  Value* CreateServerPortValue(
-      const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
-
-  Profile* profile_;  // Weak ptr.
-
-  DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_