Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/policy/browser_policy_connector.cc

 // Copyright (c) 2011 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/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 184 matching lines @@
   return std::string();
 }
 
 void BrowserPolicyConnector::ResetDevicePolicy() {
 #if defined(OS_CHROMEOS)
   if (device_cloud_policy_subsystem_.get())
     device_cloud_policy_subsystem_->Reset();
 #endif
 }
 
-void BrowserPolicyConnector::FetchDevicePolicy() {
+void BrowserPolicyConnector::FetchCloudPolicy() {
 #if defined(OS_CHROMEOS)
-  if (device_data_store_.get()) {
+  if (device_data_store_.get())
     device_data_store_->NotifyDeviceTokenChanged();
-  }
+  if (user_data_store_.get())
+    user_data_store_->NotifyDeviceTokenChanged();
 #endif
 }
 
-void BrowserPolicyConnector::FetchUserPolicy() {
-#if defined(OS_CHROMEOS)
-  if (user_data_store_.get()) {
-    user_data_store_->NotifyDeviceTokenChanged();
-  }
-#endif
+void BrowserPolicyConnector::RefreshPolicies() {
+  if (managed_platform_provider_.get())
+    managed_cloud_provider_->RefreshPolicies();
+  if (recommended_platform_provider_.get())
+    recommended_cloud_provider_->RefreshPolicies();
+  if (managed_cloud_provider_.get())
+    managed_cloud_provider_->RefreshPolicies();
+  if (recommended_cloud_provider_.get())
+    recommended_cloud_provider_->RefreshPolicies();

[Mattias Nissler (ping if slow), 2011/11/18 14:49:32]

So here is where we have both cloud providers call FetchCloudPolicy immediately?

[Joao da Silva, 2011/11/18 15:39:18]

Yes. The 2nd call will cancel the posting of DoWork of the 1st. We can also use
"internal knowledge" of the connector and assume that either both
cloud_providers exist or both don't, and just RefreshPolicies on one of them.
That seems like asking for trouble in the future, though. WDYT?

 }
 
 void BrowserPolicyConnector::ScheduleServiceInitialization(
     int64 delay_milliseconds) {
   if (user_cloud_policy_subsystem_.get()) {
     user_cloud_policy_subsystem_->
         ScheduleServiceInitialization(delay_milliseconds);
   }
 #if defined(OS_CHROMEOS)
   if (device_cloud_policy_subsystem_.get()) {
@@ skipping 117 matching lines @@
 
   return CloudPolicyDataStore::USER_AFFILIATION_NONE;
 }
 
 BrowserPolicyConnector::BrowserPolicyConnector()
     : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   managed_platform_provider_.reset(CreateManagedPlatformProvider());
   recommended_platform_provider_.reset(CreateRecommendedPlatformProvider());
 
   managed_cloud_provider_.reset(new CloudPolicyProviderImpl(
+      this,
       GetChromePolicyDefinitionList(),
       CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
   recommended_cloud_provider_.reset(new CloudPolicyProviderImpl(
+      this,
       GetChromePolicyDefinitionList(),
       CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
 
 #if defined(OS_CHROMEOS)
   InitializeDevicePolicy();
 
   network_configuration_updater_.reset(
       new NetworkConfigurationUpdater(
           managed_cloud_provider_.get(),
           chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
@@ skipping 116 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy