Intorduce a separate preference for 'proxy server mode'

chrome/browser/extensions/extension_proxy_apitest.cc

Index: chrome/browser/extensions/extension_proxy_apitest.cc
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc
index f24b7ef5689474a45935bb6fc2f88222e5fafa3f..95f701513b7f59b7da0740875812e7bf65a45213 100644
--- a/chrome/browser/extensions/extension_proxy_apitest.cc
+++ b/chrome/browser/extensions/extension_proxy_apitest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
@@ -22,11 +23,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProxyAutoSettings) {
   PrefService* pref_service = browser()->profile()->GetPrefs();
 
   const PrefService::Preference* pref =
-      pref_service->FindPreference(prefs::kProxyAutoDetect);
+      pref_service->FindPreference(prefs::kProxyServerMode);

[Pam (message me for reviews), 2010/12/18 08:29:55]

Not to quibble, but I don't understand the naming here. How is "use system proxy
settings" or "auto-detect settings" described by "ProxyServerMode"? It sounds
like the browser is itself acting as a proxy server. Would "kProxySettingsMode"
or just "kProxyMode" work?

Not obligatory, just something to consider.

[battre (please use the other), 2010/12/20 12:57:23]

Done.

I discussed this with Danno. We agree that kProxyMode sounds good. I have
replaced this and kPolicyProxySettingsMode constants. Unfortunately, we cannot
get rid of the "ProxyServerMode" literal that has been published in the policy
API. Therefore, a few occurrences of "ProxyServerMode" remain.

   ASSERT_TRUE(pref != NULL);
   ASSERT_TRUE(pref->IsExtensionControlled());
-  bool auto_detect = pref_service->GetBoolean(prefs::kProxyAutoDetect);
-  EXPECT_TRUE(auto_detect);
+  int mode = pref_service->GetInteger(prefs::kProxyServerMode);
+  EXPECT_EQ(ProxyPrefs::AUTO_DETECT, mode);
 
   pref = pref_service->FindPreference(prefs::kProxyPacUrl);
   ASSERT_TRUE(pref != NULL);
@@ -64,10 +65,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProxyManualSingle) {
 
   // Other proxy prefs should also be set, so they're all controlled from one
   // place.
-  pref = pref_service->FindPreference(prefs::kProxyAutoDetect);
+  pref = pref_service->FindPreference(prefs::kProxyServerMode);
   ASSERT_TRUE(pref != NULL);
   EXPECT_TRUE(pref->IsExtensionControlled());
-  EXPECT_FALSE(pref_service->GetBoolean(prefs::kProxyAutoDetect));
+  EXPECT_EQ(ProxyPrefs::MANUAL,
+            pref_service->GetInteger(prefs::kProxyServerMode));
 
   pref = pref_service->FindPreference(prefs::kProxyPacUrl);
   ASSERT_TRUE(pref != NULL);
@@ -75,6 +77,33 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProxyManualSingle) {
   EXPECT_EQ("", pref_service->GetString(prefs::kProxyPacUrl));
 }
 
+// Tests setting to use the systems's proxy settings.

[Pam (message me for reviews), 2010/12/18 08:29:55]

typo -> system's

[battre (please use the other), 2010/12/20 12:57:23]

Done.

+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProxySystem) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(
+      switches::kEnableExperimentalExtensionApis);
+
+  ASSERT_TRUE(RunExtensionTest("proxy/system")) << message_;
+  const Extension* extension = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension);
+
+  PrefService* pref_service = browser()->profile()->GetPrefs();
+
+  // There should be no values superseding the extension-set proxy in this test.
+  const PrefService::Preference* pref =
+      pref_service->FindPreference(prefs::kProxyServerMode);
+  ASSERT_TRUE(pref != NULL);
+  ASSERT_TRUE(pref->IsExtensionControlled());
+  int proxy_server_mode = pref_service->GetInteger(prefs::kProxyServerMode);
+  EXPECT_EQ(ProxyPrefs::SYSTEM, proxy_server_mode);
+
+  // Other proxy prefs should also be set, so they're all controlled from one
+  // place.
+  pref = pref_service->FindPreference(prefs::kProxyPacUrl);
+  ASSERT_TRUE(pref != NULL);
+  EXPECT_TRUE(pref->IsExtensionControlled());
+  EXPECT_EQ("", pref_service->GetString(prefs::kProxyPacUrl));
+}
+
 // Tests setting separate proxies for each scheme.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProxyManualIndividual) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -100,10 +129,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProxyManualIndividual) {
 
   // Other proxy prefs should also be set, so they're all controlled from one
   // place.
-  pref = pref_service->FindPreference(prefs::kProxyAutoDetect);
+  pref = pref_service->FindPreference(prefs::kProxyServerMode);
   ASSERT_TRUE(pref != NULL);
   EXPECT_TRUE(pref->IsExtensionControlled());
-  EXPECT_FALSE(pref_service->GetBoolean(prefs::kProxyAutoDetect));
+  EXPECT_EQ(ProxyPrefs::MANUAL,
+            pref_service->GetInteger(prefs::kProxyServerMode));
 
   pref = pref_service->FindPreference(prefs::kProxyPacUrl);
   ASSERT_TRUE(pref != NULL);