Fix setting a proxy configuration via policy that specifies a .pac file.

chrome/browser/policy/configuration_policy_pref_store.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/policy/configuration_policy_pref_store.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 509 matching lines @@
   switch (mode_value) {
     case kPolicyNoProxyServerMode:
       if (server || pac_url || bypass_list) {
         LOG(WARNING) << "A centrally-administered policy disables the use of"
                      << " a proxy but also specifies an explicit proxy"
                      << " configuration.";
         return false;
       }
       break;
     case kPolicyAutoDetectProxyMode:
       if (server || bypass_list) {

[battre, 2010/12/28 10:31:39]

Here we should check for "|| pac_url" as well

[danno, 2010/12/28 12:17:54]

Done.

         LOG(WARNING) << "A centrally-administered policy dictates that a proxy"
                      << " shall be auto configured but specifies fixed proxy"
                      << " servers or a by-pass list.";
         return false;
       }
       break;
     case kPolicyManuallyConfiguredProxyMode:
-      if (!server) {
+      if (server && pac_url) {
         LOG(WARNING) << "A centrally-administered policy dictates that the"
-                     << " system proxy settings should use fixed proxy servers"
-                     << " without specifying which ones.";
+                     << " system proxy settings should use both a fixed"
+                     << " proxy server and a .pac url.";
         return false;
       }
-      if (pac_url) {
+      if (!server && !pac_url) {
         LOG(WARNING) << "A centrally-administered policy dictates that the"
-                     << " system proxy settings should use fixed proxy servers"
-                     << " but also specifies a PAC script.";
+                     << " system proxy settings should use either a fixed"
+                     << " proxy server or a .pac url, but specifies neither.";
         return false;
       }
       break;
     case kPolicyUseSystemProxyMode:
       if (server || pac_url || bypass_list) {
         LOG(WARNING) << "A centrally-administered policy dictates that the"
                      << " system proxy settings should be used but also "
                      << " specifies an explicit proxy configuration.";
         return false;
       }
@@ skipping 11 matching lines @@
 
   int int_mode;
   CHECK(proxy_policies_[kPolicyProxyMode]->GetAsInteger(&int_mode));
   ProxyPrefs::ProxyMode mode;
   switch (int_mode) {
     case kPolicyNoProxyServerMode:
       mode = ProxyPrefs::MODE_DIRECT;
       break;
     case kPolicyAutoDetectProxyMode:
       mode = ProxyPrefs::MODE_AUTO_DETECT;
+      break;
+    case kPolicyManuallyConfiguredProxyMode:
+      mode = ProxyPrefs::MODE_FIXED_SERVERS;
       if (HasProxyPolicy(kPolicyProxyPacUrl))
         mode = ProxyPrefs::MODE_PAC_SCRIPT;
       break;
-    case kPolicyManuallyConfiguredProxyMode:
-      mode = ProxyPrefs::MODE_FIXED_SERVERS;
-      break;
     case kPolicyUseSystemProxyMode:
       mode = ProxyPrefs::MODE_SYSTEM;
       break;
     default:
       mode = ProxyPrefs::MODE_DIRECT;
       NOTREACHED();
   }
   prefs_.SetValue(prefs::kProxyMode, Value::CreateIntegerValue(mode));
 
   if (HasProxyPolicy(kPolicyProxyServer)) {
@@ skipping 301 matching lines @@
   // Update the initialization flag.
   if (!initialization_complete_ &&
       provider_->IsInitializationComplete()) {
     initialization_complete_ = true;
     FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
                       OnInitializationCompleted());
   }
 }
 
 }  // namespace policy