Add support for public account policy to CloudPolicyClient.

chrome/browser/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/policy/user_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/policy/cloud_policy_service.h"
-#include "chrome/browser/policy/policy_types.h"
 #include "chrome/common/pref_names.h"
 
 namespace policy {
 
 UserCloudPolicyManagerChromeOS::UserCloudPolicyManagerChromeOS(
     scoped_ptr<CloudPolicyStore> store,
     bool wait_for_policy_fetch)
     : CloudPolicyManager(store.get()),
       store_(store.Pass()),
       wait_for_policy_fetch_(wait_for_policy_fetch) {}
 
 UserCloudPolicyManagerChromeOS::~UserCloudPolicyManagerChromeOS() {}
 
-void UserCloudPolicyManagerChromeOS::Initialize(
+void UserCloudPolicyManagerChromeOS::Connect(
     PrefService* local_state,
     DeviceManagementService* device_management_service,
     UserAffiliation user_affiliation) {
   DCHECK(device_management_service);
   DCHECK(local_state);
   local_state_ = local_state;
   scoped_ptr<CloudPolicyClient> client(
       new CloudPolicyClient(std::string(), std::string(), user_affiliation,
-                            POLICY_SCOPE_USER, NULL,
+                            CloudPolicyClient::POLICY_TYPE_USER, NULL,
                             device_management_service));
   InitializeService(client.Pass());
   cloud_policy_client()->AddObserver(this);
 
   if (wait_for_policy_fetch_) {
     // If we are supposed to wait for a policy fetch, we trigger an explicit
     // policy refresh at startup that allows us to unblock initialization once
     // done. The refresh scheduler only gets started once that refresh
     // completes. Note that we might have to wait for registration to happen,
     // see OnRegistrationStateChanged() below.
@@ skipping 69 matching lines @@
 void UserCloudPolicyManagerChromeOS::OnClientError(CloudPolicyClient* client) {
   DCHECK_EQ(cloud_policy_client(), client);
   CancelWaitForPolicyFetch();
 }
 
 void UserCloudPolicyManagerChromeOS::OnInitialPolicyFetchComplete() {
   CancelWaitForPolicyFetch();
 }
 
 }  // namespace policy