Removed policy::PolicyNamespaceKey.

components/policy/core/common/cloud/cloud_policy_service.h

 // 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.
 
 #ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_SERVICE_H_
 #define COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_SERVICE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
-#include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/policy_export.h"
 
 namespace policy {
 
 // Coordinates cloud policy handling, moving downloaded policy from the client
 // to the store, and setting up client registrations from cached data in the
 // store. Also coordinates actions on policy refresh triggers.
 class POLICY_EXPORT CloudPolicyService : public CloudPolicyClient::Observer,
                                          public CloudPolicyStore::Observer {
  public:
   // Callback invoked once the policy refresh attempt has completed. Passed
   // bool parameter is true if the refresh was successful (no error).
   typedef base::Callback<void(bool)> RefreshPolicyCallback;
 
   class POLICY_EXPORT Observer {
    public:
     // Invoked when CloudPolicyService has finished initializing (any initial
     // policy load activity has completed and the CloudPolicyClient has
     // been registered, if possible).
     virtual void OnInitializationCompleted(CloudPolicyService* service) = 0;
     virtual ~Observer() {}
   };
 
   // |client| and |store| must remain valid for the object life time.
-  CloudPolicyService(const PolicyNamespaceKey& policy_ns_key,
+  CloudPolicyService(const std::string& policy_type,
+                     const std::string& settings_entity_id,
                      CloudPolicyClient* client,
                      CloudPolicyStore* store);
   ~CloudPolicyService() override;
 
   // Returns the domain that manages this user/device, according to the current
   // policy blob. Empty if not managed/not available.
   std::string ManagedBy() const;
 
   // Refreshes policy. |callback| will be invoked after the operation completes
   // or aborts because of errors.
@@ skipping 16 matching lines @@
 
  private:
   // Helper function that is called when initialization may be complete, and
   // which is responsible for notifying observers.
   void CheckInitializationCompleted();
 
   // Invokes the refresh callbacks and clears refresh state. The |success| flag
   // is passed through to the refresh callbacks.
   void RefreshCompleted(bool success);
 
-  // The policy namespace fetched by |client_| and expected by |store_|.
-  PolicyNamespaceKey policy_ns_key_;
+  // The policy type that will be fetched by the |client_|, with the optional
+  // |settings_entity_id_|.
+  std::string policy_type_;
+  std::string settings_entity_id_;
 
   // The client used to talk to the cloud.
   CloudPolicyClient* client_;
 
   // Takes care of persisting and decoding cloud policy.
   CloudPolicyStore* store_;
 
   // Tracks the state of a pending refresh operation, if any.
   enum {
     // No refresh pending.
@@ skipping 14 matching lines @@
   // Observers who will receive notifications when the service has finished
   // initializing.
   ObserverList<Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyService);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_SERVICE_H_