Explicitly wait for user policy before completing login.

chrome/browser/policy/browser_policy_connector.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/browser_policy_connector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 240 matching lines @@
   }
 #if defined(OS_CHROMEOS)
   if (device_cloud_policy_subsystem_.get()) {
     device_cloud_policy_subsystem_->
         ScheduleServiceInitialization(delay_milliseconds);
   }
 #endif
 }
 void BrowserPolicyConnector::InitializeUserPolicy(
     const std::string& user_name,
-    bool wait_for_policy_fetch) {
+    bool wait_for_policy_fetch,
+    const base::Closure& callback) {
   // Throw away the old backend.
   user_cloud_policy_subsystem_.reset();
   user_policy_token_cache_.reset();
   user_data_store_.reset();
   token_service_ = NULL;
   registrar_.RemoveAll();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   FilePath policy_dir;
   PathService::Get(chrome::DIR_USER_DATA, &policy_dir);
 #if defined(OS_CHROMEOS)
   policy_dir = policy_dir.Append(
       command_line->GetSwitchValuePath(switches::kLoginProfile));
 #endif
 
   if (command_line->HasSwitch(switches::kDeviceManagementUrl)) {
     FilePath policy_cache_dir = policy_dir.Append(kPolicyDir);
 
     UserPolicyCache* user_policy_cache =
         new UserPolicyCache(policy_cache_dir.Append(kPolicyCacheFile),
-                            wait_for_policy_fetch);
+                            wait_for_policy_fetch,
+                            callback);
     user_data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
     user_policy_token_cache_.reset(
         new UserPolicyTokenCache(user_data_store_.get(),
                                  policy_cache_dir.Append(kTokenCacheFile)));
 
     // Prepending user caches meaning they will take precedence of device policy
     // caches.
     managed_cloud_provider_->PrependCache(user_policy_cache);
     recommended_cloud_provider_->PrependCache(user_policy_cache);
     user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
@@ skipping 216 matching lines @@
         config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
   } else {
     return NULL;
   }
 #else
   return NULL;
 #endif
 }
 
 }  // namespace policy