Added ConfigurationPolicyProvider::RefreshPolicies.

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

 // Copyright (c) 2011 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/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 81 matching lines @@
   RegisterForDevicePolicy(token,
                           policy::BrowserPolicyConnector::TOKEN_TYPE_OAUTH);
 }
 
 void EnterpriseEnrollmentScreen::OnAuthCancelled() {
   UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
                             policy::kMetricEnrollmentCancelled,
                             policy::kMetricEnrollmentSize);
   auth_fetcher_.reset();
   registrar_.reset();
-  g_browser_process->browser_policy_connector()->ResetDevicePolicy();
+  g_browser_process->browser_policy_connector()->ResetCloudPolicy();

[Mattias Nissler (ping if slow), 2011/11/18 11:00:25]

I dislike this. At this point we actually want to only reset device policy, and
leave user policy alone. Same below.

[Joao da Silva, 2011/11/18 14:03:30]

Reverted to just have ResetDevicePolicy.

   get_screen_observer()->OnExit(
       ScreenObserver::ENTERPRISE_ENROLLMENT_CANCELLED);
 }
 
 void EnterpriseEnrollmentScreen::OnConfirmationClosed() {
   auth_fetcher_.reset();
   get_screen_observer()->OnExit(
       ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
 }
 
@@ skipping 103 matching lines @@
     // We have an error.
     UMA_HISTOGRAM_ENUMERATION(policy::kMetricEnrollment,
                               metric,
                               policy::kMetricEnrollmentSize);
     LOG(WARNING) << "Policy subsystem error during enrollment: " << state
                  << " details: " << error_details;
   }
 
   // Stop the policy infrastructure.
   registrar_.reset();
-  g_browser_process->browser_policy_connector()->ResetDevicePolicy();
+  g_browser_process->browser_policy_connector()->ResetCloudPolicy();
 }
 
 void EnterpriseEnrollmentScreen::HandleAuthError(
     const GoogleServiceAuthError& error) {
   scoped_ptr<GaiaAuthFetcher> scoped_killer(auth_fetcher_.release());
 
   if (!is_showing_)
     return;
 
   switch (error.state()) {
@@ skipping 42 matching lines @@
 void EnterpriseEnrollmentScreen::WriteInstallAttributesData() {
   // Since this method is also called directly.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   switch (g_browser_process->browser_policy_connector()->LockDevice(user_)) {
     case policy::EnterpriseInstallAttributes::LOCK_SUCCESS: {
       actor_->SetEditableUser(false);
       // Proceed with policy fetch.
       policy::BrowserPolicyConnector* connector =
           g_browser_process->browser_policy_connector();
-      connector->FetchDevicePolicy();
+      connector->FetchCloudPolicy();
       return;
     }
     case policy::EnterpriseInstallAttributes::LOCK_NOT_READY: {
       // InstallAttributes not ready yet, retry later.
       LOG(WARNING) << "Install Attributes not ready yet will retry in "
                    << kLockRetryIntervalMs << "ms.";
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE,
           base::Bind(&EnterpriseEnrollmentScreen::WriteInstallAttributesData,
                      weak_ptr_factory_.GetWeakPtr()),
@@ skipping 33 matching lines @@
   connector->ScheduleServiceInitialization(0);
   registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
       connector->device_cloud_policy_subsystem(), this));
 
   // Push the credentials to the policy infrastructure. It'll start enrollment
   // and notify us of progress through CloudPolicySubsystem::Observer.
   connector->RegisterForDevicePolicy(user_, token, token_type);
 }
 
 }  // namespace chromeos