chrome/browser/policy/asynchronous_policy_loader_unittest.cc - Issue 8586030: Added ConfigurationPolicyProvider::RefreshPolicies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/asynchronous_policy_loader_unittest.cc

Issue 8586030: Added ConfigurationPolicyProvider::RefreshPolicies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed win build 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/policy/asynchronous_policy_loader.cc ('k') | chrome/browser/policy/asynchronous_policy_provider.h » ('j') | chrome/browser/policy/cloud_policy_provider_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/asynchronous_policy_loader_unittest.cc

diff --git a/chrome/browser/policy/asynchronous_policy_loader_unittest.cc b/chrome/browser/policy/asynchronous_policy_loader_unittest.cc

index 3280b4786d75129ef94c720119ae6ac0b9bba46c..8b0616407012e6e4be7e5e54b899fc078177c1e0 100644

--- a/chrome/browser/policy/asynchronous_policy_loader_unittest.cc

+++ b/chrome/browser/policy/asynchronous_policy_loader_unittest.cc

@@ -27,7 +27,7 @@ void IgnoreCallback() {

class MockConfigurationPolicyObserver

: public ConfigurationPolicyProvider::Observer {

public:

- MOCK_METHOD0(OnUpdatePolicy, void());

+ MOCK_METHOD1(OnUpdatePolicy, void(ConfigurationPolicyProvider*));

void OnProviderGoingAway() {}

};

@@ -89,7 +89,7 @@ TEST_F(AsynchronousPolicyLoaderTest, InitialLoadWithFallback) {

new AsynchronousPolicyLoader(delegate, 10);

loader->Init(ignore_callback_);

loop_.RunAllPending();

- loader->Reload(true);

+ loader->Reload(ignore_callback_, true);

loop_.RunAllPending();

const DictionaryValue* loaded_dict(loader->policy());

@@ -110,7 +110,7 @@ TEST_F(AsynchronousPolicyLoaderTest, Stop) {

loop_.RunAllPending();

loader->Stop();

loop_.RunAllPending();

- loader->Reload(true);

+ loader->Reload(ignore_callback_, true);

loop_.RunAllPending();

}

@@ -135,16 +135,16 @@ TEST_F(AsynchronousPolicyLoaderTest, ProviderNotificationOnPolicyChange) {

EXPECT_CALL(*delegate, Load()).WillOnce(

CreateSequencedTestDictionary(&dictionary_number_2));

- EXPECT_CALL(observer, OnUpdatePolicy()).Times(1);

- loader->Reload(true);

+ EXPECT_CALL(observer, OnUpdatePolicy(_)).Times(1);

+ provider.RefreshPolicies();

loop_.RunAllPending();

Mock::VerifyAndClearExpectations(delegate);

Mock::VerifyAndClearExpectations(&observer);

EXPECT_CALL(*delegate, Load()).WillOnce(

CreateSequencedTestDictionary(&dictionary_number_1));

- EXPECT_CALL(observer, OnUpdatePolicy()).Times(1);

- loader->Reload(true);

+ EXPECT_CALL(observer, OnUpdatePolicy(_)).Times(1);

+ provider.RefreshPolicies();

loop_.RunAllPending();

Mock::VerifyAndClearExpectations(delegate);

Mock::VerifyAndClearExpectations(&observer);