Migrate Proxy Settings API to net::ProxyServer

chrome/browser/extensions/extension_proxy_apitest.cc

 // Copyright (c) 2010 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/extensions/extension_apitest.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 129 matching lines @@
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   ASSERT_TRUE(RunExtensionTest("proxy/individual")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension);
 
   PrefService* pref_service = browser()->profile()->GetPrefs();
   ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
-                   "http=http://1.1.1.1;"
-                       "https=socks://2.2.2.2;"
-                       "ftp=http://3.3.3.3:9000;"
+                   "http=1.1.1.1:80;"  // http:// is pruned.
+                       "https=socks5://2.2.2.2:1080;"  // socks5 equals socks.
+                       "ftp=3.3.3.3:9000;"  // http:// is pruned.
                        "socks=socks4://4.4.4.4:9090",
                    kNoPac,
                    pref_service);
 
   // Now check the incognito preferences.
   pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
   ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
-                   "http=http://1.1.1.1;"
-                       "https=socks://2.2.2.2;"
-                       "ftp=http://3.3.3.3:9000;"
+                   "http=1.1.1.1:80;"
+                       "https=socks5://2.2.2.2:1080;"
+                       "ftp=3.3.3.3:9000;"
                        "socks=socks4://4.4.4.4:9090",
                    kNoPac,
                    pref_service);
 }
 
 // Tests setting values only for incognito mode
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
     ProxyFixedIndividualIncognitoOnly) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   ASSERT_TRUE(RunExtensionTest("proxy/individual_incognito_only")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension);
 
   PrefService* pref_service = browser()->profile()->GetPrefs();
   ExpectNoSettings(pref_service);
 
   // Now check the incognito preferences.
   pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
   ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
-                   "http=http://1.1.1.1;"
-                       "https=socks://2.2.2.2;"
-                       "ftp=http://3.3.3.3:9000;"
+                   "http=1.1.1.1:80;"
+                       "https=socks5://2.2.2.2:1080;"
+                       "ftp=3.3.3.3:9000;"
                        "socks=socks4://4.4.4.4:9090",
                    kNoPac,
                    pref_service);
 }
 
 // Tests setting values also for incognito mode
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest,
     ProxyFixedIndividualIncognitoAlso) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   ASSERT_TRUE(RunExtensionTest("proxy/individual_incognito_also")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension);
 
   PrefService* pref_service = browser()->profile()->GetPrefs();
   ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
-                   "http=http://1.1.1.1;"
-                       "https=socks://2.2.2.2;"
-                       "ftp=http://3.3.3.3:9000;"
+                   "http=1.1.1.1:80;"
+                       "https=socks5://2.2.2.2:1080;"
+                       "ftp=3.3.3.3:9000;"
                        "socks=socks4://4.4.4.4:9090",
                    kNoPac,
                    pref_service);
 
   // Now check the incognito preferences.
   pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs();
   ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS,
-                   "http=http://5.5.5.5;"
-                       "https=socks://6.6.6.6;"
-                       "ftp=http://7.7.7.7:9000;"
+                   "http=5.5.5.5:80;"
+                       "https=socks5://6.6.6.6:1080;"
+                       "ftp=7.7.7.7:9000;"
                        "socks=socks4://8.8.8.8:9090",
                    kNoPac,
                    pref_service);
 }
 
 // Tests setting and unsetting values
 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividualRemove) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   ASSERT_TRUE(RunExtensionTest("proxy/individual_remove")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension);
 
   PrefService* pref_service = browser()->profile()->GetPrefs();
   ExpectNoSettings(pref_service);
 }