Added code to persist downloaded cloud policy to disk.

chrome/browser/policy/user_policy_signin_service.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_policy_signin_service.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_service.h"
 #include "chrome/browser/policy/user_cloud_policy_manager.h"
@@ skipping 107 matching lines @@
               kPolicyServiceInitializationDelayMilliseconds);
       // Initialize the UserCloudPolicyManager if it isn't already initialized.
       policy::DeviceManagementService* service = g_browser_process->
           browser_policy_connector()->device_management_service();
       manager_->Initialize(g_browser_process->local_state(),
                            service,
                            policy::USER_AFFILIATION_NONE);
       DCHECK(manager_->cloud_policy_service());
     }
 
-    // Register the CloudPolicyService if needed.
-    if (!manager_->IsClientRegistered())
+    // Register the CloudPolicyService if the cloud policy store is complete.
+    // The code below is somewhat racy in that if the store is not initialized
+    // by the time we get here, we won't register the client. In practice, we
+    // handle the case where there's no policy file because checking for the
+    // file always completes before the token DB is loaded (since they use the
+    // same thread for their operations).
+    // TODO(atwilson): If there's a problem loading the stored policy, we could
+    // be left with no policy, so we should move this code to
+    // UserCloudPolicyManager and have it initiate a DMToken fetch only once
+    // the policy load is complete (http://crbug.com/143187).
+    if (!manager_->IsClientRegistered() &&
+        manager_->cloud_policy_service()->store()->is_initialized()) {
       RegisterCloudPolicyService();
+    }
   }
 }
 
 void UserPolicySigninService::RegisterCloudPolicyService() {
+  DVLOG(1) << "Fetching new DM Token";
   // TODO(atwilson): Move the code to mint the devicemanagement token into
   // TokenService.
   std::string token = TokenServiceFactory::GetForProfile(profile_)->
                           GetOAuth2LoginRefreshToken();
   if (token.empty()) {
     DLOG(WARNING) << "No OAuth Refresh Token - delaying policy download";
     return;
   }
 
   // Do nothing if already fetching an access token.
@@ skipping 18 matching lines @@
   DLOG(WARNING) << "Could not fetch access token for "
                 << kServiceScopeChromeOSDeviceManagement;
   oauth2_access_token_fetcher_.reset();
   manager_->CancelWaitForPolicyFetch();
 }
 
 void UserPolicySigninService::OnGetTokenSuccess(
     const std::string& access_token,
     const base::Time& expiration_time) {
   // Pass along the new access token to the CloudPolicyClient.
+  DVLOG(1) << "Fetched new scoped OAuth token:" << access_token;
   manager_->RegisterClient(access_token);
   oauth2_access_token_fetcher_.reset();
 }
 
 }  // namespace policy