Explicitly wait for user policy before completing login.

chrome/browser/policy/cloud_policy_subsystem_unittest.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 <vector>
 
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/logging_work_scheduler.h"
 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/testing_cloud_policy_subsystem.h"
@@ skipping 99 matching lines @@
     prefs_.reset(new TestingPrefService);
     CloudPolicySubsystem::RegisterPrefs(prefs_.get());
     ((TestingBrowserProcess*) g_browser_process)->SetLocalState(prefs_.get());
 
     logger_.reset(new EventLogger);
     factory_.reset(new TestingPolicyURLFetcherFactory(logger_.get()));
     ASSERT_TRUE(temp_user_data_dir_.CreateUniqueTempDir());
     data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
     cache_ = new UserPolicyCache(
         temp_user_data_dir_.path().AppendASCII("CloudPolicyControllerTest"),
-        false  /* wait_for_policy_fetch */);
+        false,           /* wait_for_policy_fetch */
+        base::Closure()  /* ready_callback */);
     cloud_policy_subsystem_.reset(new TestingCloudPolicySubsystem(
         data_store_.get(), cache_,
         kDeviceManagementUrl, logger_.get()));
     cloud_policy_subsystem_->CompleteInitialization(
         prefs::kDevicePolicyRefreshRate, 0);
 
     // Abort the test on unexpected requests.
     ON_CALL(factory(), Intercept(_, _, _, _))
        .WillByDefault(InvokeWithoutArgs(
            this,
@@ skipping 314 matching lines @@
 TEST_F(CloudPolicySubsystemSerialNumberRecoveryTest, SerialRequested) {
   InSequence s;
   ExpectSuccessfulRegistration();
   ExpectPolicyRequest("", true, true);
   ExpectPolicyRequest(kMachineId, false, false);
   ExpectPolicyRequest("", false, false);
   ExecuteTest();
 }
 
 }  // policy