Removed policy::PolicyNamespaceKey.

components/policy/core/common/cloud/cloud_policy_manager.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 "components/policy/core/common/cloud/cloud_policy_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "components/policy/core/common/cloud/cloud_policy_service.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "components/policy/core/common/cloud/resource_cache.h"
 #endif
 
 namespace policy {
 
 CloudPolicyManager::CloudPolicyManager(
-    const PolicyNamespaceKey& policy_ns_key,
+    const std::string& policy_type,
+    const std::string& settings_entity_id,
     CloudPolicyStore* cloud_policy_store,
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& file_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner)
-    : core_(policy_ns_key, cloud_policy_store, task_runner),
+    : core_(policy_type, settings_entity_id, cloud_policy_store, task_runner),
       waiting_for_policy_refresh_(false),
       file_task_runner_(file_task_runner),
       io_task_runner_(io_task_runner) {
   store()->AddObserver(this);
 
   // If the underlying store is already initialized, publish the loaded
   // policy. Otherwise, request a load now.
   if (store()->is_initialized())
     CheckAndPublishPolicy();
   else
@@ skipping 102 matching lines @@
   }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 }
 
 void CloudPolicyManager::OnRefreshComplete(bool success) {
   waiting_for_policy_refresh_ = false;
   CheckAndPublishPolicy();
 }
 
 }  // namespace policy