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 63 matching lines @@
 const char* kMachineInfoSerialNumberKeys[] = {
   "sn",            // ZGB
   "Product_S/N",   // Alex
   "Product_SN",    // Mario
   "serial_number"  // VPD v2+ devices
 };
 #endif
 
 }  // namespace
 
-// static
-BrowserPolicyConnector* BrowserPolicyConnector::Create() {
-  return new BrowserPolicyConnector();
-}
+BrowserPolicyConnector::BrowserPolicyConnector()
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {}
 
 BrowserPolicyConnector::~BrowserPolicyConnector() {
   // Shutdown device cloud policy.
 #if defined(OS_CHROMEOS)
   if (device_cloud_policy_subsystem_.get())
     device_cloud_policy_subsystem_->Shutdown();
   device_cloud_policy_subsystem_.reset();
   device_data_store_.reset();
 #endif
 
   // Shutdown user cloud policy.
   if (user_cloud_policy_subsystem_.get())
     user_cloud_policy_subsystem_->Shutdown();
   user_cloud_policy_subsystem_.reset();
   user_policy_token_cache_.reset();
   user_data_store_.reset();
 }
 
+void BrowserPolicyConnector::Init() {
+  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()));
+#endif
+}
+
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::GetManagedPlatformProvider() const {
   return managed_platform_provider_.get();
 }
 
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::GetManagedCloudProvider() const {
   return managed_cloud_provider_.get();
 }
 
@@ skipping 79 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_platform_provider_->RefreshPolicies();
+  if (recommended_platform_provider_.get())
+    recommended_platform_provider_->RefreshPolicies();
+  if (managed_cloud_provider_.get())
+    managed_cloud_provider_->RefreshPolicies();
+  if (recommended_cloud_provider_.get())
+    recommended_cloud_provider_->RefreshPolicies();
 }
 
 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 111 matching lines @@
     if (pos != std::string::npos &&
         user_name.substr(pos + 1) == install_attributes_->GetDomain()) {
       return CloudPolicyDataStore::USER_AFFILIATION_MANAGED;
     }
   }
 #endif
 
   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(
-      GetChromePolicyDefinitionList(),
-      CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
-  recommended_cloud_provider_.reset(new CloudPolicyProviderImpl(
-      GetChromePolicyDefinitionList(),
-      CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
-
-#if defined(OS_CHROMEOS)
-  InitializeDevicePolicy();
-
-  network_configuration_updater_.reset(
-      new NetworkConfigurationUpdater(
-          managed_cloud_provider_.get(),
-          chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
-#endif
-}
-
-BrowserPolicyConnector::BrowserPolicyConnector(
-    ConfigurationPolicyProvider* managed_platform_provider,
-    ConfigurationPolicyProvider* recommended_platform_provider,
-    CloudPolicyProvider* managed_cloud_provider,
-    CloudPolicyProvider* recommended_cloud_provider)
-    : managed_platform_provider_(managed_platform_provider),
-      recommended_platform_provider_(recommended_platform_provider),
-      managed_cloud_provider_(managed_cloud_provider),
-      recommended_cloud_provider_(recommended_cloud_provider),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
-}
-
 void BrowserPolicyConnector::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
     const TokenService* token_source =
         content::Source<const TokenService>(source).ptr();
     DCHECK_EQ(token_service_, token_source);
     const TokenService::TokenAvailableDetails* token_details =
@@ skipping 45 matching lines @@
 #if defined(OS_CHROMEOS)
   if (device_cloud_policy_subsystem_.get()) {
     device_cloud_policy_subsystem_->CompleteInitialization(
         prefs::kDevicePolicyRefreshRate,
         kServiceInitializationStartupDelay);
   }
 #endif
 }
 
 // static
-BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() {
-  return new BrowserPolicyConnector(NULL, NULL, NULL, NULL);
-}
-
-// static
 ConfigurationPolicyProvider*
     BrowserPolicyConnector::CreateManagedPlatformProvider() {
   const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
 #if defined(OS_WIN)
   return new ConfigurationPolicyProviderWin(policy_list);
 #elif defined(OS_MACOSX)
   return new ConfigurationPolicyProviderMac(policy_list);
 #elif defined(OS_POSIX)
   FilePath config_dir_path;
   if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
@@ skipping 20 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy