Rework the device management backend implementation.

chrome/browser/policy/device_management_policy_provider.cc

Index: chrome/browser/policy/device_management_policy_provider.cc
diff --git a/chrome/browser/policy/device_management_policy_provider.cc b/chrome/browser/policy/device_management_policy_provider.cc
index babc5a41b544a0d3cc73daec7a26d27b97c7b1e4..46064c3500339e5aaaade99b5314d35e929a487d 100644
--- a/chrome/browser/policy/device_management_policy_provider.cc
+++ b/chrome/browser/policy/device_management_policy_provider.cc
@@ -67,6 +67,7 @@ DeviceManagementPolicyProvider::DeviceManagementPolicyProvider(
 DeviceManagementPolicyProvider::DeviceManagementPolicyProvider(
     const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list)
     : ConfigurationPolicyProvider(policy_list),
+      backend_(DeviceManagementBackendImpl::Get()),
       policy_request_pending_(false) {
   FilePath user_dir;
   if (!PathService::Get(chrome::DIR_USER_DATA, &user_dir))
@@ -114,14 +115,6 @@ void DeviceManagementPolicyProvider::OnError(
   // TODO(danno): do something sensible in the error case, perhaps retry later?
 }
 
-DeviceManagementBackend* DeviceManagementPolicyProvider::GetBackend() {
-  if (!backend_.get()) {
-    backend_.reset(new DeviceManagementBackendImpl(
-        GetDeviceManagementURL()));
-  }
-  return backend_.get();
-}
-
 void DeviceManagementPolicyProvider::Initialize() {
   registrar_.Add(this,
                  NotificationType::DEVICE_TOKEN_AVAILABLE,
@@ -141,7 +134,7 @@ void DeviceManagementPolicyProvider::Initialize() {
 void DeviceManagementPolicyProvider::InitializeAfterIOThreadExists() {
   const FilePath token_path = storage_dir_.Append(
       FILE_PATH_LITERAL("Token"));
-  token_fetcher_ = new DeviceTokenFetcher(GetBackend(), token_path);
+  token_fetcher_ = new DeviceTokenFetcher(backend_.get(), token_path);
   token_fetcher_->StartFetching();
 }
 
@@ -152,9 +145,8 @@ void DeviceManagementPolicyProvider::SendPolicyRequest() {
     em::DevicePolicySettingRequest* setting =
         policy_request.add_setting_request();
     setting->set_key(kChromeDevicePolicySettingKey);
-    GetBackend()->ProcessPolicyRequest(token_fetcher_->GetDeviceToken(),
-                                       policy_request,
-                                       this);
+    backend_->ProcessPolicyRequest(token_fetcher_->GetDeviceToken(),
+                                   policy_request, this);
     policy_request_pending_ = true;
   }
 }