Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / components / policy / core / common / cloud / cloud_policy_manager.cc

diff --git a/src/components/policy/core/common/cloud/cloud_policy_manager.cc b/src/components/policy/core/common/cloud/cloud_policy_manager.cc
index 73d121a..b68d97d 100644 (file)
--- a/src/components/policy/core/common/cloud/cloud_policy_manager.cc
+++ b/src/components/policy/core/common/cloud/cloud_policy_manager.cc
@@ -93,14 +93,18 @@ void CloudPolicyManager::CheckAndPublishPolicy() {
   if (IsInitializationComplete(POLICY_DOMAIN_CHROME) &&
       !waiting_for_policy_refresh_) {
     scoped_ptr<PolicyBundle> bundle(new PolicyBundle);
-    bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
-        .CopyFrom(store()->policy_map());
+    GetChromePolicy(
+        &bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())));
     if (component_policy_service_)
       bundle->MergeFrom(component_policy_service_->policy());
     UpdatePolicy(bundle.Pass());
   }
 }
 
+void CloudPolicyManager::GetChromePolicy(PolicyMap* policy_map) {
+  policy_map->CopyFrom(store()->policy_map());
+}
+
 void CloudPolicyManager::CreateComponentCloudPolicyService(
     const base::FilePath& policy_cache_path,
     const scoped_refptr<net::URLRequestContextGetter>& request_context) {