Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/browser/policy/device_token_fetcher_unittest.cc

Issue 8499021: UserPolicyCache only becomes ready after policy has been fetched. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Actually waits now, rebased Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/device_token_fetcher.h" 5 #include "chrome/browser/policy/device_token_fetcher.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/scoped_temp_dir.h" 8 #include "base/scoped_temp_dir.h"
9 #include "chrome/browser/policy/cloud_policy_data_store.h" 9 #include "chrome/browser/policy/cloud_policy_data_store.h"
10 #include "chrome/browser/policy/logging_work_scheduler.h" 10 #include "chrome/browser/policy/logging_work_scheduler.h"
(...skipping 18 matching lines...) Expand all
29 class DeviceTokenFetcherTest : public testing::Test { 29 class DeviceTokenFetcherTest : public testing::Test {
30 protected: 30 protected:
31 DeviceTokenFetcherTest() 31 DeviceTokenFetcherTest()
32 : ui_thread_(BrowserThread::UI, &loop_), 32 : ui_thread_(BrowserThread::UI, &loop_),
33 file_thread_(BrowserThread::FILE, &loop_) { 33 file_thread_(BrowserThread::FILE, &loop_) {
34 EXPECT_TRUE(temp_user_data_dir_.CreateUniqueTempDir()); 34 EXPECT_TRUE(temp_user_data_dir_.CreateUniqueTempDir());
35 } 35 }
36 36
37 virtual void SetUp() { 37 virtual void SetUp() {
38 cache_.reset(new UserPolicyCache( 38 cache_.reset(new UserPolicyCache(
39 temp_user_data_dir_.path().AppendASCII("DeviceTokenFetcherTest"))); 39 temp_user_data_dir_.path().AppendASCII("DeviceTokenFetcherTest"),
40 false /* wait_for_policy_fetch */));
40 EXPECT_CALL(service_, CreateBackend()) 41 EXPECT_CALL(service_, CreateBackend())
41 .Times(AnyNumber()) 42 .Times(AnyNumber())
42 .WillRepeatedly(MockDeviceManagementServiceProxyBackend(&backend_)); 43 .WillRepeatedly(MockDeviceManagementServiceProxyBackend(&backend_));
43 data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies()); 44 data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
44 data_store_->AddObserver(&observer_); 45 data_store_->AddObserver(&observer_);
45 } 46 }
46 47
47 virtual void TearDown() { 48 virtual void TearDown() {
48 loop_.RunAllPending(); 49 loop_.RunAllPending();
49 data_store_->RemoveObserver(&observer_); 50 data_store_->RemoveObserver(&observer_);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 &notifier_); 120 &notifier_);
120 EXPECT_CALL(observer_, OnDeviceTokenChanged()).Times(0); 121 EXPECT_CALL(observer_, OnDeviceTokenChanged()).Times(0);
121 FetchToken(&fetcher); 122 FetchToken(&fetcher);
122 loop_.RunAllPending(); 123 loop_.RunAllPending();
123 Mock::VerifyAndClearExpectations(&observer_); 124 Mock::VerifyAndClearExpectations(&observer_);
124 EXPECT_EQ("", data_store_->device_token()); 125 EXPECT_EQ("", data_store_->device_token());
125 EXPECT_TRUE(cache_->is_unmanaged()); 126 EXPECT_TRUE(cache_->is_unmanaged());
126 } 127 }
127 128
128 } // namespace policy 129 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698