Explicitly wait for user policy before completing login.

chrome/browser/policy/device_token_fetcher_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 "chrome/browser/policy/device_token_fetcher.h"
 
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/logging_work_scheduler.h"
 #include "chrome/browser/policy/mock_cloud_policy_data_store.h"
 #include "chrome/browser/policy/mock_device_management_service.h"
 #include "chrome/browser/policy/policy_notifier.h"
 #include "chrome/browser/policy/user_policy_cache.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 const char kTestToken[] = "device_token_fetcher_test_auth_token";
 
 using content::BrowserThread;
 using testing::AnyNumber;
 using testing::Mock;
 using testing::_;
 
 class DeviceTokenFetcherTest : public testing::Test {
  protected:
   DeviceTokenFetcherTest()
-      : ui_thread_(BrowserThread::UI, &loop_),
+      : ready_callback_was_invoked_(false),
+        ui_thread_(BrowserThread::UI, &loop_),
         file_thread_(BrowserThread::FILE, &loop_) {
     EXPECT_TRUE(temp_user_data_dir_.CreateUniqueTempDir());
     successful_registration_response_.mutable_register_response()->
         set_device_management_token("fake_token");
   }
 
   virtual void SetUp() {
     cache_.reset(new UserPolicyCache(
         temp_user_data_dir_.path().AppendASCII("DeviceTokenFetcherTest"),
-        false  /* wait_for_policy_fetch */));
+        false,           /* wait_for_policy_fetch */
+        base::Closure()  /* ready_callback */));
     EXPECT_CALL(service_, StartJob(_)).Times(AnyNumber());
     data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
     data_store_->AddObserver(&observer_);
   }
 
   virtual void TearDown() {
     loop_.RunAllPending();
     data_store_->RemoveObserver(&observer_);
   }
 
   void FetchToken(DeviceTokenFetcher* fetcher) {
     data_store_->SetupForTesting("", "fake_device_id", "fake_user_name",
                                  "fake_auth_token", true);
     fetcher->FetchToken();
   }
 
   void CreateNewWaitingCache() {
+    ready_callback_was_invoked_ = false;
     cache_.reset(new UserPolicyCache(
         temp_user_data_dir_.path().AppendASCII("DeviceTokenFetcherTest"),
-        true  /* wait_for_policy_fetch */));
+        true,  /* wait_for_policy_fetch */
+        base::Bind(&DeviceTokenFetcherTest::ReadyCallback,
+                   base::Unretained(this))));
     // Make this cache's disk cache ready, but have it still waiting for a
     // policy fetch.
     cache_->Load();
     loop_.RunAllPending();
     ASSERT_TRUE(cache_->last_policy_refresh_time().is_null());
     ASSERT_FALSE(cache_->IsReady());
+    ASSERT_FALSE(ready_callback_was_invoked_);
+  }
+
+  void ReadyCallback() {

[Mattias Nissler (ping if slow), 2012/02/16 10:24:11]

ditto

+    ready_callback_was_invoked_ = true;
   }
 
   MessageLoop loop_;
   MockDeviceManagementService service_;
   scoped_ptr<CloudPolicyCacheBase> cache_;
   scoped_ptr<CloudPolicyDataStore> data_store_;
   MockCloudPolicyDataStoreObserver observer_;
   PolicyNotifier notifier_;
   ScopedTempDir temp_user_data_dir_;
   em::DeviceManagementResponse successful_registration_response_;
+  bool ready_callback_was_invoked_;
 
  private:
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 };
 
 ACTION_P(VerifyRegisterRequest, known_machine_id) {
   ASSERT_TRUE(arg0);
   ASSERT_TRUE(arg0->GetRequest());
   ASSERT_TRUE(arg0->GetRequest()->has_register_request());
@@ skipping 66 matching lines @@
   Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_EQ("", data_store_->device_token());
   EXPECT_TRUE(cache_->is_unmanaged());
 }
 
 TEST_F(DeviceTokenFetcherTest, DontSetFetchingDone) {
   CreateNewWaitingCache();
   DeviceTokenFetcher fetcher(&service_, cache_.get(), data_store_.get(),
                              &notifier_);
   EXPECT_FALSE(cache_->IsReady());
+  EXPECT_FALSE(ready_callback_was_invoked_);
 }
 
 TEST_F(DeviceTokenFetcherTest, DontSetFetchingDoneWithoutPolicyFetch) {
   CreateNewWaitingCache();
   EXPECT_CALL(service_,
               CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION))
       .WillOnce(service_.SucceedJob(successful_registration_response_));
   EXPECT_CALL(observer_, OnDeviceTokenChanged());
   DeviceTokenFetcher fetcher(&service_, cache_.get(), data_store_.get(),
                              &notifier_);
   FetchToken(&fetcher);
   loop_.RunAllPending();
   // On successful token fetching the cache isn't set to ready, since the next
   // step is to fetch policy. Only failures to fetch the token should make
   // the cache ready.
   EXPECT_FALSE(cache_->IsReady());
+  EXPECT_FALSE(ready_callback_was_invoked_);
 }
 
 TEST_F(DeviceTokenFetcherTest, SetFetchingDoneWhenUnmanaged) {
   CreateNewWaitingCache();
   cache_->SetUnmanaged();
   DeviceTokenFetcher fetcher(&service_, cache_.get(), data_store_.get(),
                              &notifier_);
   EXPECT_TRUE(cache_->IsReady());
+  EXPECT_TRUE(ready_callback_was_invoked_);
 }
 
 TEST_F(DeviceTokenFetcherTest, SetFetchingDoneOnFailures) {
   CreateNewWaitingCache();
   EXPECT_CALL(service_,
               CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION))
       .WillOnce(service_.FailJob(DM_STATUS_REQUEST_FAILED));
   DeviceTokenFetcher fetcher(&service_, cache_.get(), data_store_.get(),
                              &notifier_);
   FetchToken(&fetcher);
   loop_.RunAllPending();
   // This is the opposite case of DontSetFetchingDone1.
   EXPECT_TRUE(cache_->IsReady());
+  EXPECT_TRUE(ready_callback_was_invoked_);
 }
 
 TEST_F(DeviceTokenFetcherTest, SetKnownMachineId) {
   EXPECT_CALL(service_,
               CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION))
       .WillOnce(service_.SucceedJob(successful_registration_response_));
   EXPECT_CALL(service_, StartJob(_)).WillOnce(VerifyRegisterRequest(true));
 
   DeviceTokenFetcher fetcher(&service_, cache_.get(), data_store_.get(),
                              &notifier_);
   EXPECT_CALL(observer_, OnDeviceTokenChanged());
   EXPECT_EQ("", data_store_->device_token());
 
   data_store_->set_known_machine_id(true);
   FetchToken(&fetcher);
   loop_.RunAllPending();
 
   Mock::VerifyAndClearExpectations(&observer_);
   std::string token = data_store_->device_token();
   EXPECT_NE("", token);
 }
 
 }  // namespace policy