Introduced a ForwardingPolicyProvider.

chrome/browser/policy/profile_policy_connector.cc

 // Copyright (c) 2013 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/profile_policy_connector.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/cloud_policy_manager.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/policy_service.h"
+#include "chrome/browser/policy/forwarding_policy_provider.h"
+#include "chrome/browser/policy/policy_service_impl.h"
 #include "chrome/browser/policy/schema_registry_service.h"
 #include "chrome/browser/policy/schema_registry_service_factory.h"
+#include "chrome/browser/profiles/profile.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
-#include "chrome/browser/policy/policy_service.h"
 #include "chrome/common/pref_names.h"
 #endif
 
 namespace policy {
 
 ProfilePolicyConnector::ProfilePolicyConnector(Profile* profile)
     :
 #if defined(OS_CHROMEOS)
       is_primary_user_(false),
       weak_ptr_factory_(this),
 #endif
       profile_(profile) {}
 
 ProfilePolicyConnector::~ProfilePolicyConnector() {}
 
 void ProfilePolicyConnector::Init(
     bool force_immediate_load,
 #if defined(OS_CHROMEOS)
     const chromeos::User* user,
 #endif
     CloudPolicyManager* user_cloud_policy_manager) {
+  // |providers| contains a list of the policy providers available for the
+  // PolicyService of this connector, in decreasing order of priority.
+  //
+  // Note: all the providers appended to this vector must eventually become
+  // initialized for every policy domain, otherwise some subsystems will never
+  // use the policies exposed by the PolicyService!
+  // The default ConfigurationPolicyProvider::IsInitializationComplete()
+  // result is true, so take care if a provider overrides that.
+  std::vector<ConfigurationPolicyProvider*> providers;
+
   BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
-  // |providers| contains a list of the policy providers available for the
-  // PolicyService of this connector.
-  std::vector<ConfigurationPolicyProvider*> providers;
+  forwarding_policy_provider_.reset(
+      new ForwardingPolicyProvider(connector->GetPlatformProvider()));
+  forwarding_policy_provider_->Init(
+      SchemaRegistryServiceFactory::GetForContext(profile_));
+  providers.push_back(forwarding_policy_provider_.get());
 
   if (user_cloud_policy_manager)
     providers.push_back(user_cloud_policy_manager);
 
 #if defined(OS_CHROMEOS)
   if (!user) {
     // This case occurs for the signin profile.
     special_user_policy_provider_.reset(
         new LoginProfilePolicyProvider(connector->GetPolicyService()));
     special_user_policy_provider_->Init(
         SchemaRegistryServiceFactory::GetForContext(profile_));
   } else {
     // |user| should never be NULL except for the signin profile.
     is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser();
     if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT)
       InitializeDeviceLocalAccountPolicyProvider(user->email());
   }
   if (special_user_policy_provider_)
     providers.push_back(special_user_policy_provider_.get());
 #endif
 
-  policy_service_ = connector->CreatePolicyService(providers);
+  policy_service_.reset(new PolicyServiceImpl(providers));
 
 #if defined(OS_CHROMEOS)
   if (is_primary_user_) {
     if (user_cloud_policy_manager)
       connector->SetUserPolicyDelegate(user_cloud_policy_manager);
     else if (special_user_policy_provider_)
       connector->SetUserPolicyDelegate(special_user_policy_provider_.get());
   }
 #endif
 }
 
 void ProfilePolicyConnector::InitForTesting(scoped_ptr<PolicyService> service) {
   policy_service_ = service.Pass();
 }
 
 void ProfilePolicyConnector::Shutdown() {
 #if defined(OS_CHROMEOS)
   if (is_primary_user_)
     g_browser_process->browser_policy_connector()->SetUserPolicyDelegate(NULL);
   if (special_user_policy_provider_)
     special_user_policy_provider_->Shutdown();
 #endif
+  if (forwarding_policy_provider_)
+    forwarding_policy_provider_->Shutdown();
 }
 
 #if defined(OS_CHROMEOS)
 base::Closure ProfilePolicyConnector::GetPolicyCertTrustedCallback() {
   return base::Bind(&ProfilePolicyConnector::SetUsedPolicyCertificatesOnce,
                     weak_ptr_factory_.GetWeakPtr());
 }
 #endif
 
 bool ProfilePolicyConnector::UsedPolicyCertificates() {
@@ skipping 18 matching lines @@
   if (!device_local_account_policy_service)
     return;
   special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider(
       username, device_local_account_policy_service));
   special_user_policy_provider_->Init(
       SchemaRegistryServiceFactory::GetForContext(profile_));
 }
 #endif
 
 }  // namespace policy