Move user cloud policy to BrowserProcess (was 6979011)

chrome/browser/chromeos/login/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/enterprise_enrollment_screen.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
@@ skipping 44 matching lines @@
     auth_fetcher_->StartClientLogin(user, access_code,
                                     GaiaConstants::kDeviceManagementService,
                                     std::string(), std::string(),
                                     GaiaAuthFetcher::HostedAccountsAllowed);
   }
 }
 
 void EnterpriseEnrollmentScreen::CancelEnrollment() {
   auth_fetcher_.reset();
   registrar_.reset();
-  g_browser_process->browser_policy_connector()->StopAutoRetry();
+  g_browser_process->browser_policy_connector()->DeviceStopAutoRetry();
   ScreenObserver* observer = delegate()->GetObserver();
   observer->OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_CANCELLED);
 }
 
 void EnterpriseEnrollmentScreen::CloseConfirmation() {
   auth_fetcher_.reset();
   ScreenObserver* observer = delegate()->GetObserver();
   observer->OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
 }
 
@@ skipping 38 matching lines @@
     const std::string& auth_token) {
   if (service != GaiaConstants::kDeviceManagementService) {
     NOTREACHED() << service;
     return;
   }
 
   scoped_ptr<GaiaAuthFetcher> auth_fetcher(auth_fetcher_.release());
 
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
-  if (!connector->cloud_policy_subsystem()) {
+  if (!connector->device_cloud_policy_subsystem()) {
     NOTREACHED() << "Cloud policy subsystem not initialized.";
     if (view())
       view()->ShowFatalEnrollmentError();
     return;
   }
 
   connector->ScheduleServiceInitialization(0);
   registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
-      connector->cloud_policy_subsystem(), this));
+      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->SetCredentials(user_, auth_token);
+  connector->SetDeviceCredentials(user_, auth_token);
 }
 
 void EnterpriseEnrollmentScreen::OnIssueAuthTokenFailure(
     const std::string& service,
     const GoogleServiceAuthError& error) {
   if (service != GaiaConstants::kDeviceManagementService) {
     NOTREACHED() << service;
     return;
   }
 
@@ skipping 29 matching lines @@
         return;
     }
 
     // We have an error.
     LOG(WARNING) << "Policy subsystem error during enrollment: " << state
                  << " details: " << error_details;
   }
 
   // Stop the policy infrastructure.
   registrar_.reset();
-  g_browser_process->browser_policy_connector()->StopAutoRetry();
+  g_browser_process->browser_policy_connector()->DeviceStopAutoRetry();
 }
 
 EnterpriseEnrollmentView* EnterpriseEnrollmentScreen::AllocateView() {
   return new EnterpriseEnrollmentView(this);
 }
 
 void EnterpriseEnrollmentScreen::HandleAuthError(
     const GoogleServiceAuthError& error) {
   scoped_ptr<GaiaAuthFetcher> scoped_killer(auth_fetcher_.release());
 
@@ skipping 31 matching lines @@
   runnable_method_factory_.RevokeAll();
 
   if (!view())
     return;
 
   switch (g_browser_process->browser_policy_connector()->LockDevice(user_)) {
     case policy::EnterpriseInstallAttributes::LOCK_SUCCESS: {
       // Proceed with policy fetch.
       policy::BrowserPolicyConnector* connector =
           g_browser_process->browser_policy_connector();
-      connector->FetchPolicy();
+      connector->FetchDevicePolicy();
       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,
           runnable_method_factory_.NewRunnableMethod(
               &EnterpriseEnrollmentScreen::WriteInstallAttributesData),
           kLockRetryIntervalMs);
       return;
     }
     case policy::EnterpriseInstallAttributes::LOCK_BACKEND_ERROR: {
       view()->ShowFatalEnrollmentError();
       return;
     }
     case policy::EnterpriseInstallAttributes::LOCK_WRONG_USER: {
       LOG(ERROR) << "Enrollment can not proceed because the InstallAttrs "
                  << "has been locked already!";
       view()->ShowFatalEnrollmentError();
       return;
     }
   }
 
   NOTREACHED();
 }
 
 }  // namespace chromeos