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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More fixes (partial Windows fix) Created 4 years, 8 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
« no previous file with comments | « chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc ('k') | chrome/browser/policy/policy_network_browsertest.cc » ('j') | components/policy/core/browser/proxy_policy_handler_unittest.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 43ec5cc71b30871b20f3fb4c0fa32699fdb1434a..82c2fbf60f60ed51cb46999d1ebbddb86907dc36 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -702,12 +702,10 @@ class PolicyTest : public InProcessBrowserTest {
void SetScreenshotPolicy(bool enabled) {
PolicyMap policies;
- policies.Set(key::kDisableScreenshots,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(!enabled),
- NULL);
+ policies.Set(key::kDisableScreenshots, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(!enabled)),
+ nullptr);
UpdateProviderPolicy(policies);
}
@@ -848,26 +846,27 @@ class PolicyTest : public InProcessBrowserTest {
contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(click_event);
}
- void SetPolicy(PolicyMap* policies, const char* key, base::Value* value) {
+ void SetPolicy(PolicyMap* policies,
+ const char* key,
+ std::unique_ptr<base::Value> value) {
if (value) {
- policies->Set(key,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- value,
- nullptr);
+ policies->Set(key, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, std::move(value), nullptr);
} else {
policies->Erase(key);
}
}
- void ApplySafeSearchPolicy(base::FundamentalValue* legacy_safe_search,
- base::FundamentalValue* google_safe_search,
- base::FundamentalValue* youtube_safety_mode) {
+ void ApplySafeSearchPolicy(
+ std::unique_ptr<base::FundamentalValue> legacy_safe_search,
+ std::unique_ptr<base::FundamentalValue> google_safe_search,
+ std::unique_ptr<base::FundamentalValue> youtube_safety_mode) {
PolicyMap policies;
- SetPolicy(&policies, key::kForceSafeSearch, legacy_safe_search);
- SetPolicy(&policies, key::kForceGoogleSafeSearch, google_safe_search);
- SetPolicy(&policies, key::kForceYouTubeSafetyMode, youtube_safety_mode);
+ SetPolicy(&policies, key::kForceSafeSearch, std::move(legacy_safe_search));
+ SetPolicy(&policies, key::kForceGoogleSafeSearch,
+ std::move(google_safe_search));
+ SetPolicy(&policies, key::kForceYouTubeSafetyMode,
+ std::move(youtube_safety_mode));
UpdateProviderPolicy(policies);
}
@@ -958,12 +957,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
EXPECT_EQ(BookmarkBar::HIDDEN, browser()->bookmark_bar_state());
PolicyMap policies;
- policies.Set(key::kBookmarkBarEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));
EXPECT_TRUE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
@@ -973,12 +969,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
EXPECT_EQ(BookmarkBar::SHOW, browser()->bookmark_bar_state());
- policies.Set(key::kBookmarkBarEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));
EXPECT_FALSE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
@@ -1013,12 +1006,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PRE_DefaultCookiesSetting) {
EXPECT_EQ(kCookieValue, GetCookies(browser()->profile(), GURL(kURL)));
// Now set the policy and the cookie should be gone after another restart.
PolicyMap policies;
- policies.Set(key::kDefaultCookiesSetting,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(4),
- NULL);
+ policies.Set(key::kDefaultCookiesSetting, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(4)), nullptr);
UpdateProviderPolicy(policies);
}
@@ -1062,53 +1052,36 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
// Override the default search provider using policies.
PolicyMap policies;
- policies.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policies.Set(key::kDefaultSearchProviderKeyword,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kKeyword),
- NULL);
- policies.Set(key::kDefaultSearchProviderSearchURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSearchURL),
- NULL);
- base::ListValue* alternate_urls = new base::ListValue();
+ policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kKeyword)), nullptr);
+ policies.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
+ std::unique_ptr<base::ListValue> alternate_urls(new base::ListValue);
alternate_urls->AppendString(kAlternateURL0);
alternate_urls->AppendString(kAlternateURL1);
policies.Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, alternate_urls, nullptr);
- policies.Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSearchTermsReplacementKey),
- NULL);
- policies.Set(key::kDefaultSearchProviderImageURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kImageURL),
- NULL);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ std::move(alternate_urls), nullptr);
+ policies.Set(
+ key::kDefaultSearchProviderSearchTermsReplacementKey,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSearchTermsReplacementKey)),
+ nullptr);
+ policies.Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kImageURL)), nullptr);
policies.Set(key::kDefaultSearchProviderImageURLPostParams,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kImageURLPostParams),
- NULL);
- policies.Set(key::kDefaultSearchProviderNewTabURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kNewTabURL),
- NULL);
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kImageURLPostParams)),
+ nullptr);
+ policies.Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kNewTabURL)), nullptr);
UpdateProviderPolicy(policies);
default_search = service->GetDefaultSearchProvider();
ASSERT_TRUE(default_search);
@@ -1136,12 +1109,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
// Verify that searching from the omnibox can be disabled.
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
- policies.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
EXPECT_TRUE(service->GetDefaultSearchProvider());
UpdateProviderPolicy(policies);
EXPECT_FALSE(service->GetDefaultSearchProvider());
@@ -1154,12 +1124,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyPreprocessing) {
// Add an individual proxy policy value.
PolicyMap policies;
- policies.Set(key::kProxyServerMode,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(3),
- NULL);
+ base::WrapUnique(new base::FundamentalValue(3)), nullptr);
UpdateProviderPolicy(policies);
// It should be removed and replaced with a dictionary.
@@ -1167,12 +1134,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PolicyPreprocessing) {
std::unique_ptr<base::DictionaryValue> expected_value(
new base::DictionaryValue);
expected_value->SetInteger(key::kProxyServerMode, 3);
- expected.Set(key::kProxySettings,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- expected_value.release(),
- NULL);
+ expected.Set(key::kProxySettings, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, std::move(expected_value), nullptr);
// Check both the browser and the profile.
const PolicyMap& actual_from_browser =
@@ -1205,9 +1168,12 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ForceSafeSearch) {
// Override the default SafeSearch setting using policies.
ApplySafeSearchPolicy(
- legacy == 0 ? nullptr : new base::FundamentalValue(legacy == 1),
- google == 0 ? nullptr : new base::FundamentalValue(google == 1),
- youtube == 0 ? nullptr : new base::FundamentalValue(youtube == 1));
+ legacy == 0 ? nullptr
+ : base::WrapUnique(new base::FundamentalValue(legacy == 1)),
+ google == 0 ? nullptr
+ : base::WrapUnique(new base::FundamentalValue(google == 1)),
+ youtube == 0 ? nullptr : base::WrapUnique(
+ new base::FundamentalValue(youtube == 1)));
// The legacy policy should only have an effect if both google and youtube
// are undefined.
@@ -1260,42 +1226,29 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ReplaceSearchTerms) {
// Override the default search provider using policies.
PolicyMap policies;
- policies.Set(key::kDefaultSearchProviderEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policies.Set(key::kDefaultSearchProviderKeyword,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kKeyword),
- NULL);
- policies.Set(key::kDefaultSearchProviderSearchURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSearchURL),
- NULL);
- policies.Set(key::kDefaultSearchProviderInstantURL,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kInstantURL),
- NULL);
- base::ListValue* alternate_urls = new base::ListValue();
+ policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kKeyword)), nullptr);
+ policies.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
+ policies.Set(key::kDefaultSearchProviderInstantURL, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kInstantURL)), nullptr);
+ std::unique_ptr<base::ListValue> alternate_urls(new base::ListValue);
alternate_urls->AppendString(kAlternateURL0);
alternate_urls->AppendString(kAlternateURL1);
policies.Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, alternate_urls, nullptr);
- policies.Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(kSearchTermsReplacementKey),
- NULL);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ std::move(alternate_urls), nullptr);
+ policies.Set(
+ key::kDefaultSearchProviderSearchTermsReplacementKey,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(kSearchTermsReplacementKey)),
+ nullptr);
UpdateProviderPolicy(policies);
default_search = service->GetDefaultSearchProvider();
ASSERT_TRUE(default_search);
@@ -1372,24 +1325,18 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
EXPECT_TRUE(IsWebGLEnabled(contents));
// Disable with a policy.
PolicyMap policies;
- policies.Set(key::kDisable3DAPIs,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
// Crash and reload the tab to get a new renderer.
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
EXPECT_FALSE(IsWebGLEnabled(contents));
// Enable with a policy.
- policies.Set(key::kDisable3DAPIs,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
@@ -1400,23 +1347,17 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableSpdy) {
// Verifies that SPDY can be disable by policy.
EXPECT_TRUE(net::HttpStreamFactory::spdy_enabled());
PolicyMap policies;
- policies.Set(key::kDisableSpdy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
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,
+ policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
content::RunAllPendingInMessageLoop();
EXPECT_TRUE(net::HttpStreamFactory::spdy_enabled());
@@ -1445,7 +1386,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPlugins) {
disabled_plugins.Append(new base::StringValue("*Flash*"));
PolicyMap policies;
policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, disabled_plugins.DeepCopy(), nullptr);
+ POLICY_SOURCE_CLOUD, disabled_plugins.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash));
// The user shouldn't be able to enable it.
@@ -1472,7 +1413,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPluginsExceptions) {
disabled_plugins.Append(new base::StringValue("*"));
PolicyMap policies;
policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, disabled_plugins.DeepCopy(), nullptr);
+ POLICY_SOURCE_CLOUD, disabled_plugins.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(plugin_prefs->IsPluginEnabled(*flash));
// The user shouldn't be able to enable it.
@@ -1484,7 +1425,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPluginsExceptions) {
disabled_plugins_exceptions.Append(new base::StringValue("*Flash*"));
policies.Set(key::kDisabledPluginsExceptions, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- disabled_plugins_exceptions.DeepCopy(), nullptr);
+ disabled_plugins_exceptions.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
// It should revert to the user's preference automatically.
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
@@ -1512,9 +1453,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, EnabledPlugins) {
base::ListValue plugin_list;
plugin_list.Append(new base::StringValue(content::kFlashPluginName));
PolicyMap policies;
- policies.Set(key::kEnabledPlugins, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, plugin_list.DeepCopy(),
- nullptr);
+ policies.Set(key::kEnabledPlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, plugin_list.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
// The user can't disable it anymore.
@@ -1522,9 +1462,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, EnabledPlugins) {
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
// When a plugin is both enabled and disabled, the whitelist takes precedence.
- policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, plugin_list.DeepCopy(),
- nullptr);
+ policies.Set(key::kDisabledPlugins, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, plugin_list.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(plugin_prefs->IsPluginEnabled(*flash));
}
@@ -1565,12 +1504,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AlwaysAuthorizePlugins) {
// Now set a policy to always authorize this.
PolicyMap policies;
- policies.Set(key::kAlwaysAuthorizePlugins,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kAlwaysAuthorizePlugins, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
// Reloading the page shouldn't trigger the infobar this time.
ui_test_utils::NavigateToURL(browser(), url);
@@ -1592,12 +1528,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) {
// Disable devtools via policy.
PolicyMap policies;
- policies.Set(key::kDeveloperToolsDisabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
content::WindowedNotificationObserver close_observer(
content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
content::Source<content::WebContents>(
@@ -1640,12 +1573,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_WebStoreIconHidden) {
// Turn off the web store icons.
PolicyMap policies;
- policies.Set(key::kHideWebStoreIcon,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kHideWebStoreIcon, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
// The web store icons should now be hidden.
@@ -1676,12 +1606,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DownloadDirectory) {
base::ScopedTempDir forced_dir;
ASSERT_TRUE(forced_dir.CreateUniqueTempDir());
PolicyMap policies;
- policies.Set(key::kDownloadDirectory,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(forced_dir.path().value()),
- NULL);
+ policies.Set(
+ key::kDownloadDirectory, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(forced_dir.path().value())),
+ nullptr);
UpdateProviderPolicy(policies);
DownloadAndVerifyFile(browser(), forced_dir.path(), file);
// Verify that the first download location wasn't affected.
@@ -1697,8 +1626,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSelective) {
blacklist.Append(new base::StringValue(kGoodCrxId));
PolicyMap policies;
policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
// "good.crx" is blacklisted.
@@ -1729,8 +1658,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_ExtensionInstallBlacklistWildcard) {
blacklist.Append(new base::StringValue("*"));
PolicyMap policies;
policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
// AdBlock was automatically removed.
@@ -1778,11 +1707,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallBlacklistSharedModules) {
base::StringPrintf("%s;%s", kImporterId, update_xml_url.spec().c_str()));
PolicyMap policies;
policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, forcelist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ forcelist.CreateDeepCopy(), nullptr);
extensions::ExtensionRegistry* registry =
extensions::ExtensionRegistry::Get(browser()->profile());
@@ -1829,11 +1758,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallWhitelist) {
whitelist.Append(new base::StringValue(kGoodCrxId));
PolicyMap policies;
policies.Set(key::kExtensionInstallBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
policies.Set(key::kExtensionInstallWhitelist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ whitelist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
// "adblock.crx" is blacklisted.
EXPECT_FALSE(InstallExtension(kAdBlockCrxName));
@@ -1866,8 +1795,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallForcelist) {
base::StringPrintf("%s;%s", kGoodCrxId, url.spec().c_str())));
PolicyMap policies;
policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, forcelist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ forcelist.CreateDeepCopy(), nullptr);
extensions::TestExtensionRegistryObserver observer(
extensions::ExtensionRegistry::Get(browser()->profile()));
UpdateProviderPolicy(policies);
@@ -1981,12 +1910,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionRecommendedInstallationMode) {
std::string(kGoodCrxId) + "." + extensions::schema_constants::kUpdateUrl,
url.spec());
PolicyMap policies;
- policies.Set(key::kExtensionSettings,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- dict_value.DeepCopy(),
- NULL);
+ policies.Set(key::kExtensionSettings, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ dict_value.CreateDeepCopy(), nullptr);
extensions::TestExtensionRegistryObserver observer(
extensions::ExtensionRegistry::Get(browser()->profile()));
UpdateProviderPolicy(policies);
@@ -2017,8 +1943,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionAllowedTypes) {
allowed_types.AppendString("hosted_app");
PolicyMap policies;
policies.Set(key::kExtensionAllowedTypes, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, allowed_types.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ allowed_types.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
// "good.crx" is blocked.
@@ -2076,7 +2002,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_ExtensionInstallSources) {
PolicyMap policies;
policies.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- install_sources.DeepCopy(), nullptr);
+ install_sources.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
extensions::TestExtensionRegistryObserver observer(
@@ -2299,23 +2225,19 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
// Now override with policy.
PolicyMap policies;
- policies.Set(key::kHomepageLocation,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(chrome::kChromeUICreditsURL),
- NULL);
+ policies.Set(
+ key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(chrome::kChromeUICreditsURL)),
+ nullptr);
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,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
content::WaitForLoadStop(contents);
@@ -2332,24 +2254,18 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
EXPECT_EQ(1u, active_browser_list->size());
EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
PolicyMap policies;
- policies.Set(key::kIncognitoEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(1u, active_browser_list->size());
EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
// Enable via policy and verify that incognito windows can be opened.
- policies.Set(key::kIncognitoEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(2u, active_browser_list->size());
@@ -2367,12 +2283,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
// Disable Javascript via policy.
PolicyMap policies;
- policies.Set(key::kJavascriptEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
// Reload the page.
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
@@ -2388,12 +2301,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
// The javascript content setting policy overrides the javascript policy.
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
EXPECT_FALSE(IsJavascriptEnabled(contents));
- policies.Set(key::kDefaultJavaScriptSetting,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(CONTENT_SETTING_ALLOW),
- NULL);
+ policies.Set(
+ key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(CONTENT_SETTING_ALLOW)),
+ nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
EXPECT_TRUE(IsJavascriptEnabled(contents));
@@ -2407,24 +2319,19 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) {
// Disable by old, deprecated policy.
PolicyMap policies;
- policies.Set(key::kDnsPrefetchingEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kDnsPrefetchingEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(IsNetworkPredictionEnabled(prefs));
// Enabled by new policy, this should override old one.
- policies.Set(
- key::kNetworkPredictionOptions,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(chrome_browser_net::NETWORK_PREDICTION_ALWAYS),
- NULL);
+ policies.Set(key::kNetworkPredictionOptions, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(
+ chrome_browser_net::NETWORK_PREDICTION_ALWAYS)),
+ nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(IsNetworkPredictionEnabled(prefs));
@@ -2433,12 +2340,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) {
IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) {
// Verifies that browsing history is not saved.
PolicyMap policies;
- policies.Set(key::kSavingBrowserHistoryDisabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
GURL url = ui_test_utils::GetTestUrl(
base::FilePath(base::FilePath::kCurrentDirectory),
@@ -2449,12 +2353,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) {
EXPECT_EQ(0u, enumerator1.urls().size());
// Now flip the policy and try again.
- policies.Set(key::kSavingBrowserHistoryDisabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), url);
// Verify that the navigation was saved in the history.
@@ -2575,9 +2476,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklist) {
base::ListValue blacklist;
blacklist.Append(new base::StringValue("bbb.com"));
PolicyMap policies;
- policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
// All bbb.com URLs are blocked, and "aaa.com" is still unblocked.
@@ -2589,9 +2489,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklist) {
base::ListValue whitelist;
whitelist.Append(new base::StringValue("sub.bbb.com"));
whitelist.Append(new base::StringValue("bbb.com/policy"));
- policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, whitelist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
CheckURLIsBlocked(browser(), kURLS[1]);
@@ -2624,9 +2523,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, URLBlacklistSubresources) {
blacklist.Append(new base::StringValue(image_url.spec().c_str()));
blacklist.Append(new base::StringValue(subframe_url.spec().c_str()));
PolicyMap policies;
- policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
@@ -2671,9 +2569,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) {
base::ListValue blacklist;
blacklist.Append(new base::StringValue("file://*"));
PolicyMap policies;
- policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
@@ -2682,9 +2579,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) {
// Replace the URLblacklist with disabling the file scheme.
blacklist.Remove(base::StringValue("file://*"), NULL);
- policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
@@ -2695,9 +2591,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) {
base::ListValue disabledscheme;
disabledscheme.Append(new base::StringValue("file"));
- policies.Set(key::kDisabledSchemes, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- disabledscheme.DeepCopy(), nullptr);
+ policies.Set(key::kDisabledSchemes, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, disabledscheme.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
@@ -2708,13 +2603,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_FileURLBlacklist) {
// Whitelist one folder and blacklist an another just inside.
base::ListValue whitelist;
whitelist.Append(new base::StringValue(base_path));
- policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLWhitelist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, whitelist.CreateDeepCopy(), nullptr);
blacklist.Append(new base::StringValue(folder_path));
- policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
FlushBlacklistPolicy();
@@ -2760,12 +2653,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLVersionFallbackMin) {
GetSSLVersionFallbackMin(browser()->profile()));
PolicyMap policies;
- policies.Set(key::kSSLVersionFallbackMin,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(new_value),
- NULL);
+ policies.Set(key::kSSLVersionFallbackMin, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(new_value)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_EQ(net::SSL_PROTOCOL_VERSION_TLS1_1,
@@ -2775,12 +2665,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLVersionFallbackMin) {
#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) {
PolicyMap policies;
- policies.Set(key::kFullscreenAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
BrowserWindow* browser_window = browser()->window();
@@ -2793,12 +2680,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) {
IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedApp) {
PolicyMap policies;
- policies.Set(key::kFullscreenAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
const extensions::Extension* extension =
@@ -2865,12 +2749,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
EXPECT_FALSE(audio_handler->IsOutputMuted());
EXPECT_EQ(1, test_observer->output_mute_changed_count());
PolicyMap policies;
- policies.Set(key::kAudioOutputAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(audio_handler->IsOutputMuted());
// This should not change the state now and should not trigger output mute
@@ -2880,12 +2761,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
EXPECT_EQ(1, test_observer->output_mute_changed_count());
// Toggle back and observe if the output mute changed event is fired.
- policies.Set(key::kAudioOutputAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(audio_handler->IsOutputMuted());
EXPECT_EQ(1, test_observer->output_mute_changed_count());
@@ -2918,12 +2796,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SessionLengthLimit) {
EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_APP_TERMINATING, _, _))
.Times(0);
PolicyMap policies;
- policies.Set(key::kSessionLengthLimit,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(kThreeHoursInMs),
- NULL);
+ policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(kThreeHoursInMs)),
+ nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2931,12 +2807,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SessionLengthLimit) {
// Decrease the session length limit to 1 hour. Verify that the session is
// terminated immediately.
EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_APP_TERMINATING, _, _));
- policies.Set(key::kSessionLengthLimit,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(kOneHourInMs),
- NULL);
+ policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(kOneHourInMs)),
+ nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2965,10 +2839,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
// Require initial user activity.
PolicyMap policies;
policies.Set(key::kWaitForInitialUserActivity, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2976,12 +2848,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
// terminated.
EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_APP_TERMINATING, _, _))
.Times(0);
- policies.Set(key::kSessionLengthLimit,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(kOneHourInMs),
- NULL);
+ policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(kOneHourInMs)),
+ nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -3013,16 +2883,12 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
.Times(0);
PolicyMap policies;
policies.Set(key::kWaitForInitialUserActivity, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policies.Set(key::kSessionLengthLimit,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(kThreeHoursInMs),
- NULL);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(kThreeHoursInMs)),
+ nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -3030,12 +2896,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
// Decrease the session length limit to 1 hour. Verify that the session is
// terminated immediately.
EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_APP_TERMINATING, _, _));
- policies.Set(key::kSessionLengthLimit,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(kOneHourInMs),
- NULL);
+ policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(kOneHourInMs)),
+ nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -3053,12 +2917,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, LargeCursorEnabled) {
// Verify that policy overrides the manual setting.
PolicyMap policies;
- policies.Set(key::kLargeCursorEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kLargeCursorEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsLargeCursorEnabled());
@@ -3080,12 +2941,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SpokenFeedbackEnabled) {
// Verify that policy overrides the manual setting.
PolicyMap policies;
- policies.Set(key::kSpokenFeedbackEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kSpokenFeedbackEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsSpokenFeedbackEnabled());
@@ -3107,12 +2965,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HighContrastEnabled) {
// Verify that policy overrides the manual setting.
PolicyMap policies;
- policies.Set(key::kHighContrastEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kHighContrastEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsHighContrastEnabled());
@@ -3134,12 +2989,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeNone) {
// Verify that policy overrides the manual setting.
PolicyMap policies;
- policies.Set(key::kScreenMagnifierType,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(0),
- NULL);
+ policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(0)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());
@@ -3158,12 +3010,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeFull) {
// Verify that policy can enable the full-screen magnifier.
PolicyMap policies;
- policies.Set(key::kScreenMagnifierType,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(ui::MAGNIFIER_FULL),
- NULL);
+ policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(ui::MAGNIFIER_FULL)),
+ nullptr);
UpdateProviderPolicy(policies);
EXPECT_EQ(ui::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
@@ -3185,12 +3035,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AccessibilityVirtualKeyboardEnabled) {
// Verify that policy overrides the manual setting.
PolicyMap policies;
- policies.Set(key::kVirtualKeyboardEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsVirtualKeyboardEnabled());
@@ -3211,12 +3058,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
// Verify enabling the policy takes effect immediately and that that user
// cannot disable the keyboard..
PolicyMap policies;
- policies.Set(key::kTouchVirtualKeyboardEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(keyboard::IsKeyboardEnabled());
keyboard::SetTouchKeyboardEnabled(false);
@@ -3224,12 +3068,9 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
// Verify that disabling the policy takes effect immediately and that the user
// cannot enable the keyboard.
- policies.Set(key::kTouchVirtualKeyboardEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(keyboard::IsKeyboardEnabled());
keyboard::SetTouchKeyboardEnabled(true);
@@ -3302,28 +3143,25 @@ class RestoreOnStartupPolicyTest
expected_urls_.push_back(GURL(kRestoredURLs[i]));
}
PolicyMap policies;
- policies.Set(key::kRestoreOnStartup,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(SessionStartupPref::kPrefValueURLs),
- NULL);
- policies.Set(
- key::kRestoreOnStartupURLs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, urls.DeepCopy(), nullptr);
+ policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(
+ SessionStartupPref::kPrefValueURLs)),
+ nullptr);
+ policies.Set(key::kRestoreOnStartupURLs, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, urls.CreateDeepCopy(),
+ nullptr);
provider_.UpdateChromePolicy(policies);
}
void NTP() {
// Verifies that policy can set the startup page to the NTP.
PolicyMap policies;
- policies.Set(
- key::kRestoreOnStartup,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(SessionStartupPref::kPrefValueNewTab),
- NULL);
+ policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(
+ SessionStartupPref::kPrefValueNewTab)),
+ nullptr);
provider_.UpdateChromePolicy(policies);
expected_urls_.push_back(GURL(chrome::kChromeUINewTabURL));
}
@@ -3331,12 +3169,11 @@ class RestoreOnStartupPolicyTest
void Last() {
// Verifies that policy can set the startup pages to the last session.
PolicyMap policies;
- policies.Set(key::kRestoreOnStartup,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(SessionStartupPref::kPrefValueLast),
- NULL);
+ policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(
+ SessionStartupPref::kPrefValueLast)),
+ nullptr);
provider_.UpdateChromePolicy(policies);
// This should restore the tabs opened at PRE_RunTest below.
for (size_t i = 0; i < arraysize(kRestoredURLs); ++i)
@@ -3394,24 +3231,16 @@ class PolicyStatisticsCollectorTest : public PolicyTest {
void SetUpInProcessBrowserTestFixture() override {
PolicyTest::SetUpInProcessBrowserTestFixture();
PolicyMap policies;
- policies.Set(key::kShowHomeButton,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
- policies.Set(key::kBookmarkBarEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
- policies.Set(key::kHomepageLocation,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue("http://chromium.org"),
- NULL);
+ policies.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue("http://chromium.org")),
+ nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -3474,17 +3303,15 @@ class MediaStreamDevicesControllerBrowserTest
void ConfigurePolicyMap(PolicyMap* policies, const char* policy_name,
const char* whitelist_policy,
const char* allow_rule) {
- policies->Set(policy_name,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies->Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(policy_value_),
- NULL);
+ base::WrapUnique(new base::FundamentalValue(policy_value_)),
+ nullptr);
if (whitelist_policy) {
// Add an entry to the whitelist that allows the specified URL regardless
// of the setting of kAudioCapturedAllowed.
- base::ListValue* list = new base::ListValue();
+ std::unique_ptr<base::ListValue> list(new base::ListValue);
if (allow_rule) {
list->AppendString(allow_rule);
request_url_allowed_via_whitelist_ = true;
@@ -3496,7 +3323,7 @@ class MediaStreamDevicesControllerBrowserTest
request_url_allowed_via_whitelist_ = false;
}
policies->Set(whitelist_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, list, nullptr);
+ POLICY_SOURCE_CLOUD, std::move(list), nullptr);
}
}
@@ -3707,7 +3534,7 @@ IN_PROC_BROWSER_TEST_F(WebBluetoothPolicyTest, Block) {
PolicyMap policies;
policies.Set(key::kDefaultWebBluetoothGuardSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(2), nullptr);
+ base::WrapUnique(new base::FundamentalValue(2)), nullptr);
UpdateProviderPolicy(policies);
std::string rejection;
@@ -3738,7 +3565,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SafeBrowsingExtendedReportingOptInAllowed) {
PolicyMap policies;
policies.Set(key::kSafeBrowsingExtendedReportingOptInAllowed,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false), nullptr);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(
prefs->GetBoolean(prefs::kSafeBrowsingExtendedReportingOptInAllowed));
@@ -3820,7 +3647,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLErrorOverridingDisallowed) {
PolicyMap policies;
policies.Set(key::kSSLErrorOverrideAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false), nullptr);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
// Policy should not allow overriding anymore.
@@ -3867,8 +3694,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TaskManagerEndProcessEnabled) {
// Disabling ending tasks in task manager by policy
PolicyMap policies1;
policies1.Set(key::kTaskManagerEndProcessEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false), nullptr);
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies1);
// Policy should not allow ending tasks anymore.
@@ -3877,8 +3704,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TaskManagerEndProcessEnabled) {
// Enabling ending tasks in task manager by policy
PolicyMap policies2;
policies2.Set(key::kTaskManagerEndProcessEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true), nullptr);
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies2);
// Policy should allow ending tasks again.
@@ -3893,12 +3720,10 @@ class PolicyVariationsServiceTest : public PolicyTest {
void SetUpInProcessBrowserTestFixture() override {
PolicyTest::SetUpInProcessBrowserTestFixture();
PolicyMap policies;
- policies.Set(key::kVariationsRestrictParameter,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue("restricted"),
- NULL);
+ policies.Set(key::kVariationsRestrictParameter, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue("restricted")),
+ nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -3928,8 +3753,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingBlacklistSelective) {
blacklist.Append(new base::StringValue("host.name"));
PolicyMap policies;
policies.Set(key::kNativeMessagingBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
PrefService* prefs = browser()->profile()->GetPrefs();
@@ -3944,8 +3769,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingBlacklistWildcard) {
blacklist.Append(new base::StringValue("*"));
PolicyMap policies;
policies.Set(key::kNativeMessagingBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
PrefService* prefs = browser()->profile()->GetPrefs();
@@ -3962,11 +3787,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NativeMessagingWhitelist) {
whitelist.Append(new base::StringValue("host.name"));
PolicyMap policies;
policies.Set(key::kNativeMessagingBlacklist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, blacklist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ blacklist.CreateDeepCopy(), nullptr);
policies.Set(key::kNativeMessagingWhitelist, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, whitelist.DeepCopy(),
- nullptr);
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ whitelist.CreateDeepCopy(), nullptr);
UpdateProviderPolicy(policies);
PrefService* prefs = browser()->profile()->GetPrefs();
@@ -3988,12 +3813,9 @@ class HardwareAccelerationModePolicyTest : public PolicyTest {
void SetUpInProcessBrowserTestFixture() override {
PolicyTest::SetUpInProcessBrowserTestFixture();
PolicyMap policies;
- policies.Set(key::kHardwareAccelerationModeEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kHardwareAccelerationModeEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -4020,20 +3842,14 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) {
EXPECT_FALSE(display_manager->unified_desktop_enabled());
// Now set the policy and check that unified desktop is turned on.
PolicyMap policies;
- policies.Set(key::kUnifiedDesktopEnabledByDefault,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- NULL);
+ policies.Set(key::kUnifiedDesktopEnabledByDefault, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(display_manager->unified_desktop_enabled());
- policies.Set(key::kUnifiedDesktopEnabledByDefault,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- NULL);
+ policies.Set(key::kUnifiedDesktopEnabledByDefault, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(display_manager->unified_desktop_enabled());
}
@@ -4094,23 +3910,17 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcEnabled) {
// Enable ARC.
PolicyMap policies;
- policies.Set(key::kArcEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies.Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- nullptr);
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(pref->GetBoolean(prefs::kArcEnabled));
EXPECT_EQ(arc::ArcBridgeService::State::READY, arc_bridge_service->state());
// Disable ARC.
- policies.Set(key::kArcEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ policies.Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(false),
- nullptr);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(pref->GetBoolean(prefs::kArcEnabled));
EXPECT_EQ(arc::ArcBridgeService::State::STOPPED, arc_bridge_service->state());
@@ -4165,12 +3975,10 @@ class ChromeOSPolicyTest : public PolicyTest {
void SetAndTestSystemTimezoneAutomaticDetectionPolicy(int policy_value) {
PolicyMap policies;
- policies.Set(key::kSystemTimezoneAutomaticDetection,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(policy_value),
- NULL);
+ policies.Set(key::kSystemTimezoneAutomaticDetection, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(policy_value)),
+ nullptr);
UpdateProviderPolicy(policies);
PrefService* local_state = g_browser_process->local_state();
« no previous file with comments | « chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc ('k') | chrome/browser/policy/policy_network_browsertest.cc » ('j') | components/policy/core/browser/proxy_policy_handler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698