Refactored the CloudPolicyProvider so that it becomes initialized once and stays initialized.

chrome/browser/policy/configuration_policy_provider.cc

 // 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.
 
 #include "chrome/browser/policy/configuration_policy_provider.h"
 
 #include <algorithm>
 
 #include "chrome/browser/policy/policy_map.h"
 #include "policy/policy_constants.h"
@@ skipping 79 matching lines @@
         proxy_settings->Clear();
         current_priority = *entry;
       }
       if (!entry->has_higher_priority_than(current_priority) &&
           !current_priority.has_higher_priority_than(*entry)) {
         proxy_settings->Set(kProxyPolicies[i], entry->value->DeepCopy());
       }
       policies->Erase(kProxyPolicies[i]);
     }
   }
-  if (!proxy_settings->empty() && !policies->Get(key::kProxySettings)) {
+  // Sets the new |proxy_settings| if kProxySettings isn't set yet, or if the
+  // new priority is higher.
+  const PolicyMap::Entry* existing = policies->Get(key::kProxySettings);
+  if (!proxy_settings->empty() &&
+      (!existing || current_priority.has_higher_priority_than(*existing))) {
     policies->Set(key::kProxySettings,
                   current_priority.level,
                   current_priority.scope,
                   proxy_settings.release());
   }
 }
 
 void ConfigurationPolicyProvider::NotifyPolicyUpdated() {
   FOR_EACH_OBSERVER(ConfigurationPolicyProvider::Observer,
                     observer_list_,
@@ skipping 35 matching lines @@
     ConfigurationPolicyProvider* provider) {
   DCHECK_EQ(provider_, provider);
   // The |observer_| might delete |this| during this callback. Don't touch any
   // of |this| field's after it returns.
   provider_->RemoveObserver(this);
   provider_ = NULL;
   observer_->OnProviderGoingAway(provider);
 }
 
 }  // namespace policy