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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11667006: Create a list of policy changes before notifying observers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 years, 12 months 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
« chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('K') | « chrome/browser/policy/network_configuration_updater_unittest.cc ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | chrome/browser/policy/policy_prefs_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 1bec8bdf6e0ce54027b54274faba3ecf957dbcfc..8b4e09e9737710181b4e1aee4ae173068037f562 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -14,6 +14,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/ref_counted.h"
#include "base/path_service.h"
+#include "base/run_loop.h"
#include "base/string16.h"
#include "base/stringprintf.h"
#include "base/test/test_file_util.h"
@@ -538,6 +539,13 @@ class PolicyTest : public InProcessBrowserTest {
observer.Wait();
}
+ void UpdateProviderPolicy(const PolicyMap& policy) {
+ provider_.UpdateChromePolicy(policy);
+ DCHECK(MessageLoop::current());
+ base::RunLoop loop;
+ loop.RunUntilIdle();
+ }
+
MockConfigurationPolicyProvider provider_;
};
@@ -556,7 +564,7 @@ class LocalePolicyTest : public PolicyTest {
policies.Set(
key::kApplicationLocaleValue, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateStringValue("fr"));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// The "en-US" ResourceBundle is always loaded before this step for tests,
// but in this test we want the browser to load the bundle as it
// normally would.
@@ -594,7 +602,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
PolicyMap policies;
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));
EXPECT_TRUE(prefs->GetBoolean(prefs::kShowBookmarkBar));
EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
@@ -605,14 +613,14 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));
EXPECT_FALSE(prefs->GetBoolean(prefs::kShowBookmarkBar));
// The bookmark bar is hidden in the NTP when disabled by policy.
EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
policies.Clear();
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_FALSE(prefs->IsManagedPreference(prefs::kShowBookmarkBar));
EXPECT_FALSE(prefs->GetBoolean(prefs::kShowBookmarkBar));
// The bookmark bar is shown detached in the NTP, when disabled by prefs only.
@@ -641,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PRE_ClearSiteDataOnExit) {
PolicyMap policies;
policies.Set(key::kClearSiteDataOnExit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
}
IN_PROC_BROWSER_TEST_F(PolicyTest, ClearSiteDataOnExit) {
@@ -691,7 +699,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
policies.Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateStringValue(kSearchTermsReplacementKey));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
default_search = service->GetDefaultSearchProvider();
ASSERT_TRUE(default_search);
EXPECT_EQ(kKeyword, default_search->keyword());
@@ -717,7 +725,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
EXPECT_TRUE(service->GetDefaultSearchProvider());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_FALSE(service->GetDefaultSearchProvider());
ui_test_utils::SendToOmniboxAndSubmit(location_bar, "should not work");
// This means that submitting won't trigger any action.
@@ -757,7 +765,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ForceSafeSearch) {
PolicyMap policies;
policies.Set(key::kForceSafeSearch, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(prefs::kForceSafeSearch));
EXPECT_TRUE(prefs->GetBoolean(prefs::kForceSafeSearch));
@@ -818,7 +826,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ReplaceSearchTerms) {
alternate_urls->AppendString(kAlternateURL1);
policies.Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, alternate_urls);
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
default_search = service->GetDefaultSearchProvider();
ASSERT_TRUE(default_search);
EXPECT_EQ(kKeyword, default_search->keyword());
@@ -885,7 +893,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
PolicyMap policies;
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// Crash and reload the tab to get a new renderer.
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
@@ -893,7 +901,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
// Enable with a policy.
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
EXPECT_TRUE(IsWebGLEnabled(contents));
@@ -906,14 +914,14 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableSpdy) {
PolicyMap policies;
policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
content::RunAllPendingInMessageLoop();
EXPECT_FALSE(net::HttpStreamFactory::spdy_enabled());
// Verify that it can be force-enabled too.
browser()->profile()->GetPrefs()->SetBoolean(prefs::kDisableSpdy, true);
policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
content::RunAllPendingInMessageLoop();
EXPECT_TRUE(net::HttpStreamFactory::spdy_enabled());
}
@@ -941,7 +949,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPlugins) {
PolicyMap policies;
policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, disabled_plugins.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash));
// The user shouldn't be able to enable it.
EXPECT_FALSE(SetPluginEnabled(plugin_prefs, flash, true));
@@ -967,7 +975,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPluginsExceptions) {
PolicyMap policies;
policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, disabled_plugins.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash));
// The user shouldn't be able to enable it.
EXPECT_FALSE(SetPluginEnabled(plugin_prefs, flash, true));
@@ -979,7 +987,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPluginsExceptions) {
base::Value::CreateStringValue("*Flash*"));
policies.Set(key::kDisabledPluginsExceptions, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, disabled_plugins_exceptions.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// It should revert to the user's preference automatically.
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
// And the user should be able to disable and enable again.
@@ -1007,7 +1015,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, EnabledPlugins) {
PolicyMap policies;
policies.Set(key::kEnabledPlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, plugin_list.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
// The user can't disable it anymore.
EXPECT_FALSE(SetPluginEnabled(plugin_prefs, flash, false));
@@ -1016,7 +1024,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, EnabledPlugins) {
// When a plugin is both enabled and disabled, the whitelist takes precedence.
policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, plugin_list.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
}
@@ -1059,7 +1067,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AlwaysAuthorizePlugins) {
PolicyMap policies;
policies.Set(key::kAlwaysAuthorizePlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// Reloading the page shouldn't trigger the infobar this time.
ui_test_utils::NavigateToURL(browser(), url);
EXPECT_EQ(0u, infobar_service->GetInfoBarCount());
@@ -1079,7 +1087,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) {
PolicyMap policies;
policies.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// The existing devtools window should have closed.
EXPECT_FALSE(DevToolsWindow::GetDockedInstanceForInspectedTab(contents));
// And it's not possible to open it again.
@@ -1113,7 +1121,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DownloadDirectory) {
policies.Set(key::kDownloadDirectory, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
base::Value::CreateStringValue(forced_dir.path().value()));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
DownloadAndVerifyFile(browser(), forced_dir.path(), file);
// Verify that the first download location wasn't affected.
EXPECT_FALSE(file_util::PathExists(initial_dir.path().Append(file)));
@@ -1130,7 +1138,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklist) {
PolicyMap policies;
policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, blacklist.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// "good.crx" is blacklisted.
EXPECT_FALSE(InstallExtension(kGoodCrxName));
@@ -1148,7 +1156,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklist) {
blacklist.Append(base::Value::CreateStringValue("*"));
policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, blacklist.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// AdBlock was automatically removed.
ASSERT_FALSE(service->GetExtensionById(kAdBlockCrxId, true));
// And can't be installed again, nor can good.crx.
@@ -1172,7 +1180,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallWhitelist) {
POLICY_SCOPE_USER, blacklist.DeepCopy());
policies.Set(key::kExtensionInstallWhitelist, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, whitelist.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// "adblock.crx" is blacklisted.
EXPECT_FALSE(InstallExtension(kAdBlockCrxName));
EXPECT_FALSE(service->GetExtensionById(kAdBlockCrxId, true));
@@ -1207,7 +1215,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallForcelist) {
content::WindowedNotificationObserver observer(
chrome::NOTIFICATION_EXTENSION_INSTALLED,
content::NotificationService::AllSources());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
observer.Wait();
content::Details<const extensions::Extension> details = observer.details();
EXPECT_EQ(kGoodCrxId, details->id());
@@ -1228,7 +1236,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionAllowedTypes) {
PolicyMap policies;
policies.Set(key::kExtensionAllowedTypes, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, allowed_types.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// "good.crx" is blocked.
EXPECT_FALSE(InstallExtension(kGoodCrxName));
@@ -1263,14 +1271,14 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
base::Value::CreateStringValue(chrome::kChromeUICreditsURL));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
content::WaitForLoadStop(contents);
EXPECT_EQ(GURL(chrome::kChromeUICreditsURL), contents->GetURL());
policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
content::WaitForLoadStop(contents);
EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), contents->GetURL());
@@ -1286,7 +1294,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
PolicyMap policies;
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_FALSE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(1u, BrowserList::size());
EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
@@ -1294,7 +1302,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
// Enable via policy and verify that incognito windows can be opened.
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(2u, BrowserList::size());
EXPECT_TRUE(BrowserList::IsOffTheRecordSessionActive());
@@ -1311,7 +1319,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
PolicyMap policies;
policies.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// Reload the page.
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
EXPECT_FALSE(IsJavascriptEnabled(contents));
@@ -1328,7 +1336,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
policies.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL));
EXPECT_TRUE(IsJavascriptEnabled(contents));
}
@@ -1338,7 +1346,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) {
PolicyMap policies;
policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
GURL url = ui_test_utils::GetTestUrl(
FilePath(FilePath::kCurrentDirectory),
FilePath(FILE_PATH_LITERAL("empty.html")));
@@ -1350,7 +1358,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) {
// Now flip the policy and try again.
policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), url);
// Verify that the navigation was saved in the history.
ui_test_utils::HistoryEnumerator enumerator2(browser()->profile());
@@ -1372,7 +1380,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TranslateEnabled) {
PolicyMap policies;
policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// Instead of waiting for NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, this test
// waits for NOTIFICATION_TAB_LANGUAGE_DETERMINED because that's what the
// TranslateManager observes. This allows checking that an infobar is NOT
@@ -1400,7 +1408,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TranslateEnabled) {
EXPECT_EQ(0u, infobar_service->GetInfoBarCount());
policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
// Navigating to the same URL now doesn't trigger an infobar.
content::WindowedNotificationObserver language_observer2(
chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
@@ -1438,7 +1446,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklist) {
PolicyMap policies;
policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, blacklist.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
// All bbb.com URLs are blocked.
CheckCanOpenURL(browser(), kURLS[0]);
@@ -1451,7 +1459,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklist) {
whitelist.Append(base::Value::CreateStringValue("bbb.com/policy"));
policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, whitelist.DeepCopy());
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
CheckCanOpenURL(browser(), kURLS[0]);
CheckURLIsBlocked(browser(), kURLS[1]);
@@ -1509,7 +1517,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
PolicyMap policies;
policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_TRUE(audio_handler->IsMuted());
// This should not change the state now and should not trigger OnMuteToggled.
audio_handler->SetMuted(false);
@@ -1519,7 +1527,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
EXPECT_CALL(*mock, OnMuteToggled()).Times(1);
policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
- provider_.UpdateChromePolicy(policies);
+ UpdateProviderPolicy(policies);
EXPECT_FALSE(audio_handler->IsMuted());
EXPECT_CALL(*mock, OnMuteToggled()).Times(1);
audio_handler->SetMuted(true);
« chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('K') | « chrome/browser/policy/network_configuration_updater_unittest.cc ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | chrome/browser/policy/policy_prefs_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698