Convert DeviceTokenFetcher and CloudPolicyController response callbacks.

chrome/browser/policy/cloud_policy_data_store.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/policy/cloud_policy_data_store.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
-#include "chrome/browser/policy/proto/device_management_constants.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 CloudPolicyDataStore::~CloudPolicyDataStore() {}
 
 // static
 CloudPolicyDataStore* CloudPolicyDataStore::CreateForUserPolicies() {
   return new CloudPolicyDataStore(em::DeviceRegisterRequest::USER,
-                                  kChromeUserPolicyType);
+                                  dm_protocol::kChromeUserPolicyType);
 }
 
 // static
 CloudPolicyDataStore* CloudPolicyDataStore::CreateForDevicePolicies() {
   return new CloudPolicyDataStore(em::DeviceRegisterRequest::DEVICE,
-                                  kChromeDevicePolicyType);
+                                  dm_protocol::kChromeDevicePolicyType);
 }
 
 CloudPolicyDataStore::CloudPolicyDataStore(
     const em::DeviceRegisterRequest_Type policy_register_type,
     const std::string& policy_type)
-    : user_affiliation_(USER_AFFILIATION_NONE),
+    : user_affiliation_(policy::USER_AFFILIATION_NONE),
       policy_register_type_(policy_register_type),
       policy_type_(policy_type),
       token_cache_loaded_(false) {}
 
 void CloudPolicyDataStore::SetDeviceToken(const std::string& device_token,
                                           bool from_cache) {
   DCHECK(token_cache_loaded_ != from_cache);
   if (!token_cache_loaded_) {
     // The cache should be the first to set the token. (It may be "")
     DCHECK(from_cache);
@@ skipping 52 matching lines @@
 
 const std::string& CloudPolicyDataStore::device_id() const {
   return device_id_;
 }
 
 void CloudPolicyDataStore::set_user_name(const std::string& user_name) {
   user_name_ = user_name;
 }
 
 void CloudPolicyDataStore::set_user_affiliation(
-    UserAffiliation user_affiliation) {
+    policy::UserAffiliation user_affiliation) {
   user_affiliation_ = user_affiliation;
 }
 
 const std::string& CloudPolicyDataStore::device_token() const {
   return device_token_;
 }
 
 const std::string& CloudPolicyDataStore::gaia_token() const {
   return gaia_token_;
 }
@@ skipping 24 matching lines @@
 }
 
 bool CloudPolicyDataStore::token_cache_loaded() const {
   return token_cache_loaded_;
 }
 
 const std::string& CloudPolicyDataStore::user_name() const {
   return user_name_;
 }
 
-CloudPolicyDataStore::UserAffiliation
-    CloudPolicyDataStore::user_affiliation() const {
+policy::UserAffiliation CloudPolicyDataStore::user_affiliation() const {
   return user_affiliation_;
 }
 
 #if defined(OS_CHROMEOS)
 DeviceStatusCollector*
     CloudPolicyDataStore::device_status_collector() {
   return device_status_collector_.get();
 }
 
 void CloudPolicyDataStore::set_device_status_collector(
@@ skipping 14 matching lines @@
 
 void CloudPolicyDataStore::NotifyCredentialsChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnCredentialsChanged());
 }
 
 void CloudPolicyDataStore::NotifyDeviceTokenChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceTokenChanged());
 }
 
 }  // namespace policy