Move user cloud policy to BrowserProcess (was 6979011)

chrome/browser/policy/cloud_policy_subsystem.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/cloud_policy_subsystem.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/cloud_policy_controller.h"
 #include "chrome/browser/policy/cloud_policy_identity_strategy.h"
-#include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/policy/device_token_fetcher.h"
 #include "chrome/browser/policy/policy_notifier.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 
@@ skipping 103 matching lines @@
 
 CloudPolicySubsystem::ErrorDetails CloudPolicySubsystem::error_details() {
   return notifier_->error_details();
 }
 
 void CloudPolicySubsystem::StopAutoRetry() {
   cloud_policy_controller_->StopAutoRetry();
   device_token_fetcher_->StopAutoRetry();
 }
 
-ConfigurationPolicyProvider* CloudPolicySubsystem::GetManagedPolicyProvider() {
-  if (cloud_policy_cache_.get())
-    return cloud_policy_cache_->GetManagedPolicyProvider();
-
-  return NULL;
-}
-
-ConfigurationPolicyProvider*
-    CloudPolicySubsystem::GetRecommendedPolicyProvider() {
-  if (cloud_policy_cache_.get())
-    return cloud_policy_cache_->GetRecommendedPolicyProvider();
-
-  return NULL;
-}
-
 // static
 void CloudPolicySubsystem::RegisterPrefs(PrefService* pref_service) {
   pref_service->RegisterIntegerPref(prefs::kDevicePolicyRefreshRate,
                                     kDefaultPolicyRefreshRateMs,
                                     PrefService::UNSYNCABLE_PREF);
   pref_service->RegisterIntegerPref(prefs::kUserPolicyRefreshRate,
                                     kDefaultPolicyRefreshRateMs,
                                     PrefService::UNSYNCABLE_PREF);
 }
 
 void CloudPolicySubsystem::UpdatePolicyRefreshRate(int64 refresh_rate) {
   if (cloud_policy_controller_.get()) {
     // Clamp to sane values.
     refresh_rate = std::max(kPolicyRefreshRateMinMs, refresh_rate);
     refresh_rate = std::min(kPolicyRefreshRateMaxMs, refresh_rate);
     cloud_policy_controller_->SetRefreshRate(refresh_rate);
   }
 }
 
 void CloudPolicySubsystem::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     DCHECK_EQ(*(Details<std::string>(details).ptr()),
               std::string(refresh_pref_name_));
-    PrefService* pref_service = Source<PrefService>(source).ptr();
-    // Temporarily also consider the profile preference service as a valid
-    // source, since we cannot yet push user cloud policy to |local_state|.
-    UpdatePolicyRefreshRate(pref_service->GetInteger(refresh_pref_name_));
+    PrefService* local_state = g_browser_process->local_state();
+    DCHECK_EQ(Source<PrefService>(source).ptr(), local_state);
+    UpdatePolicyRefreshRate(local_state->GetInteger(refresh_pref_name_));
   } else {
     NOTREACHED();
   }
 }
 
 void CloudPolicySubsystem::ScheduleServiceInitialization(
     int64 delay_milliseconds) {
   if (device_management_service_.get())
     device_management_service_->ScheduleInitialization(delay_milliseconds);
 }
@@ skipping 15 matching lines @@
                                 identity_strategy_,
                                 notifier_.get()));
 }
 
 CloudPolicySubsystem::CloudPolicySubsystem()
     : refresh_pref_name_(NULL),
       identity_strategy_(NULL) {
 }
 
 }  // namespace policy