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

Side by Side Diff: chrome/browser/policy/cloud_policy_controller_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/cloud_policy_controller.h" 5 #include "chrome/browser/policy/cloud_policy_controller.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/scoped_temp_dir.h" 9 #include "base/scoped_temp_dir.h"
10 #include "chrome/browser/policy/cloud_policy_data_store.h" 10 #include "chrome/browser/policy/cloud_policy_data_store.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 public: 44 public:
45 CloudPolicyControllerTest() 45 CloudPolicyControllerTest()
46 : ui_thread_(BrowserThread::UI, &loop_), 46 : ui_thread_(BrowserThread::UI, &loop_),
47 file_thread_(BrowserThread::FILE, &loop_) {} 47 file_thread_(BrowserThread::FILE, &loop_) {}
48 48
49 virtual ~CloudPolicyControllerTest() {} 49 virtual ~CloudPolicyControllerTest() {}
50 50
51 virtual void SetUp() { 51 virtual void SetUp() {
52 ASSERT_TRUE(temp_user_data_dir_.CreateUniqueTempDir()); 52 ASSERT_TRUE(temp_user_data_dir_.CreateUniqueTempDir());
53 cache_.reset(new UserPolicyCache( 53 cache_.reset(new UserPolicyCache(
54 temp_user_data_dir_.path().AppendASCII("CloudPolicyControllerTest"))); 54 temp_user_data_dir_.path().AppendASCII("CloudPolicyControllerTest"),
55 false /* wait_for_policy_fetch */));
55 token_fetcher_.reset(new MockDeviceTokenFetcher(cache_.get())); 56 token_fetcher_.reset(new MockDeviceTokenFetcher(cache_.get()));
56 EXPECT_CALL(service_, CreateBackend()) 57 EXPECT_CALL(service_, CreateBackend())
57 .Times(AnyNumber()) 58 .Times(AnyNumber())
58 .WillRepeatedly(MockDeviceManagementServiceProxyBackend(&backend_)); 59 .WillRepeatedly(MockDeviceManagementServiceProxyBackend(&backend_));
59 data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies()); 60 data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
60 } 61 }
61 62
62 virtual void TearDown() { 63 virtual void TearDown() {
63 controller_.reset(); // Unregisters observers. 64 controller_.reset(); // Unregisters observers.
64 data_store_.reset(); 65 data_store_.reset();
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 "who@what.com", "auth", true); 234 "who@what.com", "auth", true);
234 EXPECT_CALL(backend_, ProcessPolicyRequest(_, _, _, _, _)).WillOnce( 235 EXPECT_CALL(backend_, ProcessPolicyRequest(_, _, _, _, _)).WillOnce(
235 MockDeviceManagementBackendFailPolicy( 236 MockDeviceManagementBackendFailPolicy(
236 DeviceManagementBackend::kErrorServiceInvalidSerialNumber)); 237 DeviceManagementBackend::kErrorServiceInvalidSerialNumber));
237 EXPECT_CALL(*token_fetcher_.get(), SetSerialNumberInvalidState()).Times(1); 238 EXPECT_CALL(*token_fetcher_.get(), SetSerialNumberInvalidState()).Times(1);
238 CreateNewController(); 239 CreateNewController();
239 loop_.RunAllPending(); 240 loop_.RunAllPending();
240 } 241 }
241 242
242 } // namespace policy 243 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698