Added a PolicyDomainDescriptor.

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.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/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chrome/browser/policy/policy_bundle.h"
+#include "chrome/browser/policy/policy_domain_descriptor.h"
 #include "chrome/common/pref_names.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 UserCloudPolicyManagerChromeOS::UserCloudPolicyManagerChromeOS(
     scoped_ptr<CloudPolicyStore> store,
     scoped_ptr<ResourceCache> resource_cache,
@@ skipping 67 matching lines @@
   if (domain == POLICY_DOMAIN_CHROME)
     return !wait_for_policy_fetch_;
   if (ComponentCloudPolicyService::SupportsDomain(domain) &&
       component_policy_service_) {
     return component_policy_service_->is_initialized();
   }
   return true;
 }
 
 void UserCloudPolicyManagerChromeOS::RegisterPolicyDomain(
-    PolicyDomain domain,
-    const std::set<std::string>& component_ids) {
-  if (ComponentCloudPolicyService::SupportsDomain(domain) &&
+    scoped_refptr<const PolicyDomainDescriptor> descriptor) {
+  if (ComponentCloudPolicyService::SupportsDomain(descriptor->domain()) &&
       component_policy_service_) {
-    component_policy_service_->RegisterPolicyDomain(domain, component_ids);
+    component_policy_service_->RegisterPolicyDomain(descriptor);
   }
 }
 
 scoped_ptr<PolicyBundle> UserCloudPolicyManagerChromeOS::CreatePolicyBundle() {
   scoped_ptr<PolicyBundle> bundle = CloudPolicyManager::CreatePolicyBundle();
   if (component_policy_service_)
     bundle->MergeFrom(component_policy_service_->policy());
   return bundle.Pass();
 }
 
@@ skipping 149 matching lines @@
     // start the scheduler. The |component_policy_service_| will call back into
     // OnComponentCloudPolicyUpdated() once it's ready.
     return;
   }
 
   core()->StartRefreshScheduler();
   core()->TrackRefreshDelayPref(local_state_, prefs::kUserPolicyRefreshRate);
 }
 
 }  // namespace policy