cros proxy: implement proxy settings in onc and unittests

BUG=chromium-os:23674
TEST=verify per bug rpt.

Review URL: http://codereview.chromium.org/9188065

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

1 files changed, 6 insertions, 7 deletions

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index 03160b3..eacbfb1 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -106,6 +106,11 @@ class ProxyConfigServiceImpl
     // persisted as string property in flimflam for a network.
     bool SerializeForNetwork(std::string* output);
 
+    // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>"
+    static void EncodeAndAppendProxyServer(const std::string& scheme,
+                                           const net::ProxyServer& server,
+                                           std::string* spec);
+
     Mode mode;
 
     ProxyPrefs::ConfigState state;
@@ -131,12 +136,6 @@ class ProxyConfigServiceImpl
 
     // Exceptions for when not to use a proxy.
     net::ProxyBypassRules  bypass_rules;
-
-   private:
-    // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>"
-    static void EncodeAndAppendProxyServer(const std::string& scheme,
-                                           const net::ProxyServer& server,
-                                           std::string* spec);
   };
 
   // Constructor.