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

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

Issue 8467011: Include only policy definitions that apply to the platfrom in the policy definition list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adjust all policy provider tests to use shared testing code. Net-negative line counts! 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
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 f253a2bed2634663776e18ec224b562880e70475..57bbb8e4ba30bc21de12eaaad414c9d5fa07d96a 100644
--- a/chrome/browser/policy/asynchronous_policy_loader_unittest.cc
+++ b/chrome/browser/policy/asynchronous_policy_loader_unittest.cc
@@ -10,9 +10,9 @@
#include "chrome/browser/policy/mock_configuration_policy_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
-using ::testing::_;
using ::testing::InSequence;
using ::testing::Return;
+using ::testing::_;
namespace policy {
@@ -86,7 +86,7 @@ TEST_F(AsynchronousPolicyLoaderTest, InitialLoadWithFallback) {
new AsynchronousPolicyLoader(delegate_.release(), 10);
loader->Init(ignore_callback_);
loop_.RunAllPending();
- loader->Reload();
+ loader->Reload(true);
loop_.RunAllPending();
const DictionaryValue* loaded_dict(loader->policy());
@@ -106,7 +106,7 @@ TEST_F(AsynchronousPolicyLoaderTest, Stop) {
loop_.RunAllPending();
loader->Stop();
loop_.RunAllPending();
- loader->Reload();
+ loader->Reload(true);
loop_.RunAllPending();
}
@@ -134,11 +134,7 @@ TEST_F(AsynchronousPolicyLoaderTest, ProviderNotificationOnPolicyChange) {
ConfigurationPolicyObserverRegistrar registrar;
registrar.Init(&provider, &observer);
loop_.RunAllPending();
- loader->Reload();
- loop_.RunAllPending();
- loader->Reload();
- loop_.RunAllPending();
- loader->Reload();
+ loader->Reload(true);
loop_.RunAllPending();
}

Powered by Google App Engine
This is Rietveld 408576698