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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 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/javascript_policy_handler_unittest.cc ('k') | chrome/browser/policy/policy_network_browsertest.cc » ('j') | no next file with comments »
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 1c77345bbea40745a727ff99c9c251e938af09a7..d72125ba09b36180256cdc014aef0abf01eb7348 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -658,7 +658,7 @@ class PolicyTest : public InProcessBrowserTest {
PolicyMap policies;
policies.Set(key::kDisableScreenshots, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(!enabled), nullptr);
+ base::MakeUnique<base::Value>(!enabled), nullptr);
UpdateProviderPolicy(policies);
}
@@ -813,11 +813,10 @@ class PolicyTest : public InProcessBrowserTest {
}
}
- void ApplySafeSearchPolicy(
- std::unique_ptr<base::FundamentalValue> legacy_safe_search,
- std::unique_ptr<base::FundamentalValue> google_safe_search,
- std::unique_ptr<base::FundamentalValue> legacy_youtube,
- std::unique_ptr<base::FundamentalValue> youtube_restrict) {
+ void ApplySafeSearchPolicy(std::unique_ptr<base::Value> legacy_safe_search,
+ std::unique_ptr<base::Value> google_safe_search,
+ std::unique_ptr<base::Value> legacy_youtube,
+ std::unique_ptr<base::Value> youtube_restrict) {
PolicyMap policies;
SetPolicy(&policies, key::kForceSafeSearch, std::move(legacy_safe_search));
SetPolicy(&policies, key::kForceGoogleSafeSearch,
@@ -909,7 +908,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
PolicyMap policies;
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));
EXPECT_TRUE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
@@ -921,7 +920,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));
EXPECT_FALSE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
@@ -958,7 +957,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, PRE_DefaultCookiesSetting) {
PolicyMap policies;
policies.Set(key::kDefaultCookiesSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(4), nullptr);
+ base::MakeUnique<base::Value>(4), nullptr);
UpdateProviderPolicy(policies);
}
@@ -1006,7 +1005,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
PolicyMap policies;
policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
base::MakeUnique<base::StringValue>(kKeyword), nullptr);
@@ -1066,7 +1065,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
EXPECT_TRUE(service->GetDefaultSearchProvider());
UpdateProviderPolicy(policies);
EXPECT_FALSE(service->GetDefaultSearchProvider());
@@ -1080,8 +1079,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SeparateProxyPoliciesMerging) {
// Add an individual proxy policy value.
PolicyMap policies;
policies.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(3),
- nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(3), nullptr);
UpdateProviderPolicy(policies);
// It should be removed and replaced with a dictionary.
@@ -1128,16 +1126,16 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, LegacySafeSearch) {
ApplySafeSearchPolicy(
legacy_safe_search == 0
? nullptr
- : base::MakeUnique<base::FundamentalValue>(legacy_safe_search == 1),
+ : base::MakeUnique<base::Value>(legacy_safe_search == 1),
google_safe_search == 0
? nullptr
- : base::MakeUnique<base::FundamentalValue>(google_safe_search == 1),
+ : base::MakeUnique<base::Value>(google_safe_search == 1),
legacy_youtube == 0
? nullptr
- : base::MakeUnique<base::FundamentalValue>(legacy_youtube == 1),
+ : base::MakeUnique<base::Value>(legacy_youtube == 1),
youtube_restrict == 0
? nullptr // subtracting 1 gives 0,1,2, see above
- : base::MakeUnique<base::FundamentalValue>(youtube_restrict - 1));
+ : base::MakeUnique<base::Value>(youtube_restrict - 1));
// The legacy ForceSafeSearch policy should only have an effect if none of
// the other 3 policies are defined.
@@ -1200,14 +1198,13 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ForceGoogleSafeSearch) {
// ForceGoogleSafeSearch policy.
for (int safe_search = 0; safe_search < 3; safe_search++) {
// Override the Google safe search policy.
- ApplySafeSearchPolicy(
- nullptr, // ForceSafeSearch
- safe_search == 0 // ForceGoogleSafeSearch
- ? nullptr
- : base::MakeUnique<base::FundamentalValue>(safe_search == 1),
- nullptr, // ForceYouTubeSafetyMode
- nullptr // ForceYouTubeRestrict
- );
+ ApplySafeSearchPolicy(nullptr, // ForceSafeSearch
+ safe_search == 0 // ForceGoogleSafeSearch
+ ? nullptr
+ : base::MakeUnique<base::Value>(safe_search == 1),
+ nullptr, // ForceYouTubeSafetyMode
+ nullptr // ForceYouTubeRestrict
+ );
// Verify that the safe search pref behaves the way we expect.
PrefService* prefs = browser()->profile()->GetPrefs();
EXPECT_EQ(safe_search != 0,
@@ -1233,8 +1230,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
// Disable with a policy.
PolicyMap policies;
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true),
+ nullptr);
UpdateProviderPolicy(policies);
// Crash and reload the tab to get a new renderer.
content::CrashTab(contents);
@@ -1242,8 +1239,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
EXPECT_FALSE(IsWebGLEnabled(contents));
// Enable with a policy.
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false),
+ nullptr);
UpdateProviderPolicy(policies);
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
@@ -1284,7 +1281,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisablePacHttpsUrlStripping) {
PolicyMap policies;
policies.Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::WrapUnique(new base::Value(false)), nullptr);
UpdateProviderPolicy(policies);
content::RunAllPendingInMessageLoop();
@@ -1307,7 +1304,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) {
PolicyMap policies;
policies.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
content::WindowedNotificationObserver close_observer(
content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
content::Source<content::WebContents>(
@@ -1394,7 +1391,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabledExtensionsDevMode) {
PolicyMap policies;
policies.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
// Expect devcontrols to be hidden now...
@@ -1437,7 +1434,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_WebStoreIconHidden) {
PolicyMap policies;
policies.Set(key::kHideWebStoreIcon, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::WrapUnique(new base::Value(true)), nullptr);
UpdateProviderPolicy(policies);
// The web store icons should now be hidden.
@@ -2091,7 +2088,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
content::WaitForLoadStop(contents);
@@ -2116,7 +2113,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_IncognitoEnabled) {
PolicyMap policies;
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(1u, active_browser_list->size());
@@ -2125,7 +2122,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_IncognitoEnabled) {
// Enable via policy and verify that incognito windows can be opened.
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(2u, active_browser_list->size());
@@ -2145,7 +2142,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
PolicyMap policies;
policies.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
// Reload the page.
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
@@ -2163,8 +2160,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
EXPECT_FALSE(IsJavascriptEnabled(contents));
policies.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(CONTENT_SETTING_ALLOW),
- nullptr);
+ base::MakeUnique<base::Value>(CONTENT_SETTING_ALLOW), nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
EXPECT_TRUE(IsJavascriptEnabled(contents));
@@ -2180,7 +2176,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) {
PolicyMap policies;
policies.Set(key::kDnsPrefetchingEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(IsNetworkPredictionEnabled(prefs));
@@ -2188,7 +2184,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) {
// Enabled by new policy, this should override old one.
policies.Set(key::kNetworkPredictionOptions, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
chrome_browser_net::NETWORK_PREDICTION_ALWAYS),
nullptr);
UpdateProviderPolicy(policies);
@@ -2201,7 +2197,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) {
PolicyMap policies;
policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
GURL url = ui_test_utils::GetTestUrl(
base::FilePath(base::FilePath::kCurrentDirectory),
@@ -2214,7 +2210,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, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), url);
// Verify that the navigation was saved in the history.
@@ -2241,7 +2237,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_TranslateEnabled) {
PolicyMap policies;
policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::WrapUnique(new base::Value(true)), nullptr);
UpdateProviderPolicy(policies);
// Instead of waiting for NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, this test
// waits for NOTIFICATION_TAB_LANGUAGE_DETERMINED because that's what the
@@ -2284,7 +2280,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_TranslateEnabled) {
EXPECT_EQ(0u, infobar_service->infobar_count());
policies.Set(key::kTranslateEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::WrapUnique(new base::Value(false)), nullptr);
UpdateProviderPolicy(policies);
// Navigating to the same URL now doesn't trigger an infobar.
content::WindowedNotificationObserver language_observer2(
@@ -2469,7 +2465,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) {
PolicyMap policies;
policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
BrowserWindow* browser_window = browser()->window();
@@ -2484,7 +2480,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedApp) {
PolicyMap policies;
policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
const extensions::Extension* extension =
@@ -2552,7 +2548,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
PolicyMap policies;
policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(audio_handler->IsOutputMuted());
// This should not change the state now and should not trigger output mute
@@ -2564,7 +2560,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
// 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,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(audio_handler->IsOutputMuted());
EXPECT_EQ(1, test_observer->output_mute_changed_count());
@@ -2599,8 +2595,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SessionLengthLimit) {
PolicyMap policies;
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(kThreeHoursInMs),
- nullptr);
+ base::MakeUnique<base::Value>(kThreeHoursInMs), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2610,7 +2605,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SessionLengthLimit) {
EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_APP_TERMINATING, _, _));
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(kOneHourInMs), nullptr);
+ base::MakeUnique<base::Value>(kOneHourInMs), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2640,7 +2635,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
PolicyMap policies;
policies.Set(key::kWaitForInitialUserActivity, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::WrapUnique(new base::Value(true)), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2650,8 +2645,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
.Times(0);
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(kOneHourInMs)),
- nullptr);
+ base::WrapUnique(new base::Value(kOneHourInMs)), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2684,11 +2678,10 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
PolicyMap policies;
policies.Set(key::kWaitForInitialUserActivity, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(kThreeHoursInMs),
- nullptr);
+ base::MakeUnique<base::Value>(kThreeHoursInMs), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2698,7 +2691,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest,
EXPECT_CALL(observer, Observe(chrome::NOTIFICATION_APP_TERMINATING, _, _));
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(kOneHourInMs), nullptr);
+ base::MakeUnique<base::Value>(kOneHourInMs), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2718,7 +2711,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, LargeCursorEnabled) {
PolicyMap policies;
policies.Set(key::kLargeCursorEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsLargeCursorEnabled());
@@ -2742,7 +2735,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SpokenFeedbackEnabled) {
PolicyMap policies;
policies.Set(key::kSpokenFeedbackEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsSpokenFeedbackEnabled());
@@ -2766,7 +2759,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HighContrastEnabled) {
PolicyMap policies;
policies.Set(key::kHighContrastEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsHighContrastEnabled());
@@ -2790,7 +2783,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeNone) {
PolicyMap policies;
policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(0), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());
@@ -2811,8 +2804,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeFull) {
PolicyMap policies;
policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(ash::MAGNIFIER_FULL),
- nullptr);
+ base::MakeUnique<base::Value>(ash::MAGNIFIER_FULL), nullptr);
UpdateProviderPolicy(policies);
EXPECT_EQ(ash::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
@@ -2836,7 +2828,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AccessibilityVirtualKeyboardEnabled) {
PolicyMap policies;
policies.Set(key::kVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsVirtualKeyboardEnabled());
@@ -2859,7 +2851,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
PolicyMap policies;
policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(keyboard::IsKeyboardEnabled());
keyboard::SetTouchKeyboardEnabled(false);
@@ -2869,7 +2861,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
// cannot enable the keyboard.
policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(keyboard::IsKeyboardEnabled());
keyboard::SetTouchKeyboardEnabled(true);
@@ -2942,11 +2934,11 @@ class RestoreOnStartupPolicyTest
expected_urls_.push_back(GURL(kRestoredURLs[i]));
}
PolicyMap policies;
- policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
- SessionStartupPref::kPrefValueURLs)),
- nullptr);
+ policies.Set(
+ key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::Value(SessionStartupPref::kPrefValueURLs)),
+ nullptr);
policies.Set(key::kRestoreOnStartupURLs, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, urls.CreateDeepCopy(),
nullptr);
@@ -2956,11 +2948,11 @@ class RestoreOnStartupPolicyTest
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,
- base::WrapUnique(new base::FundamentalValue(
- SessionStartupPref::kPrefValueNewTab)),
- nullptr);
+ policies.Set(
+ key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::Value(SessionStartupPref::kPrefValueNewTab)),
+ nullptr);
provider_.UpdateChromePolicy(policies);
expected_urls_.push_back(GURL(chrome::kChromeUINewTabURL));
}
@@ -2968,11 +2960,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,
- base::WrapUnique(new base::FundamentalValue(
- SessionStartupPref::kPrefValueLast)),
- nullptr);
+ policies.Set(
+ key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::Value(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)
@@ -3035,10 +3027,10 @@ class PolicyStatisticsCollectorTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
base::MakeUnique<base::StringValue>("http://chromium.org"),
@@ -3107,8 +3099,7 @@ class MediaStreamDevicesControllerBrowserTest
const char* allow_rule) {
policies->Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(policy_value_),
- nullptr);
+ base::MakeUnique<base::Value>(policy_value_), nullptr);
if (whitelist_policy) {
// Add an entry to the whitelist that allows the specified URL regardless
@@ -3336,7 +3327,7 @@ IN_PROC_BROWSER_TEST_F(WebBluetoothPolicyTest, Block) {
PolicyMap policies;
policies.Set(key::kDefaultWebBluetoothGuardSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(2), nullptr);
+ base::MakeUnique<base::Value>(2), nullptr);
UpdateProviderPolicy(policies);
std::string rejection;
@@ -3425,7 +3416,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SafeBrowsingExtendedReportingOptInAllowed) {
PolicyMap policies;
policies.Set(key::kSafeBrowsingExtendedReportingOptInAllowed,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::WrapUnique(new base::Value(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(
prefs->GetBoolean(prefs::kSafeBrowsingExtendedReportingOptInAllowed));
@@ -3507,7 +3498,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SSLErrorOverridingDisallowed) {
PolicyMap policies;
policies.Set(key::kSSLErrorOverrideAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::WrapUnique(new base::Value(false)), nullptr);
UpdateProviderPolicy(policies);
// Policy should not allow overriding anymore.
@@ -3555,7 +3546,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TaskManagerEndProcessEnabled) {
PolicyMap policies1;
policies1.Set(key::kTaskManagerEndProcessEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::WrapUnique(new base::Value(false)), nullptr);
UpdateProviderPolicy(policies1);
// Policy should not allow ending tasks anymore.
@@ -3565,7 +3556,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, TaskManagerEndProcessEnabled) {
PolicyMap policies2;
policies2.Set(key::kTaskManagerEndProcessEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::WrapUnique(new base::Value(true)), nullptr);
UpdateProviderPolicy(policies2);
// Policy should allow ending tasks again.
@@ -3582,7 +3573,7 @@ class MediaRouterPolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kEnableMediaRouter, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(enable), nullptr);
+ base::MakeUnique<base::Value>(enable), nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -3607,7 +3598,7 @@ class MediaRouterActionPolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kShowCastIconInToolbar, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(enable), nullptr);
+ base::MakeUnique<base::Value>(enable), nullptr);
provider_.UpdateChromePolicy(policies);
}
@@ -3766,11 +3757,10 @@ ComponentUpdaterPolicyTest::~ComponentUpdaterPolicyTest() {}
void ComponentUpdaterPolicyTest::SetEnableComponentUpdates(
bool enable_component_updates) {
PolicyMap policies;
- policies.Set(
- key::kComponentUpdatesEnabled, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::WrapUnique(new base::FundamentalValue(enable_component_updates)),
- nullptr);
+ policies.Set(key::kComponentUpdatesEnabled, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::Value(enable_component_updates)),
+ nullptr);
UpdateProviderPolicy(policies);
}
@@ -4069,7 +4059,7 @@ class HardwareAccelerationModePolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kHardwareAccelerationModeEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -4098,12 +4088,12 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) {
PolicyMap policies;
policies.Set(key::kUnifiedDesktopEnabledByDefault, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::WrapUnique(new base::Value(true)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(display_manager->unified_desktop_enabled());
policies.Set(key::kUnifiedDesktopEnabledByDefault, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::WrapUnique(new base::Value(false)), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(display_manager->unified_desktop_enabled());
}
@@ -4140,8 +4130,7 @@ class ArcPolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(enabled)),
- nullptr);
+ base::WrapUnique(new base::Value(enabled)), nullptr);
UpdateProviderPolicy(policies);
if (browser()) {
const PrefService* const prefs = browser()->profile()->GetPrefs();
@@ -4187,7 +4176,7 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcBackupRestoreEnabled) {
PolicyMap policies;
policies.Set(key::kArcBackupRestoreEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(pref->GetBoolean(prefs::kArcBackupRestoreEnabled));
EXPECT_TRUE(pref->IsManagedPreference(prefs::kArcBackupRestoreEnabled));
@@ -4195,7 +4184,7 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcBackupRestoreEnabled) {
// Enable ARC Backup & Restore through the policy.
policies.Set(key::kArcBackupRestoreEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(pref->GetBoolean(prefs::kArcBackupRestoreEnabled));
EXPECT_TRUE(pref->IsManagedPreference(prefs::kArcBackupRestoreEnabled));
@@ -4208,16 +4197,16 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcLocationServiceEnabled) {
// Values of the ArcLocationServiceEnabled policy to be tested.
const std::vector<base::Value> test_policy_values = {
- base::Value(), // unset
- base::FundamentalValue(false), // disabled
- base::FundamentalValue(true), // enabled
+ base::Value(), // unset
+ base::Value(false), // disabled
+ base::Value(true), // enabled
};
// Values of the DefaultGeolocationSetting policy to be tested.
const std::vector<base::Value> test_default_geo_policy_values = {
- base::Value(), // unset
- base::FundamentalValue(1), // 'AllowGeolocation'
- base::FundamentalValue(2), // 'BlockGeolocation'
- base::FundamentalValue(3), // 'AskGeolocation'
+ base::Value(), // unset
+ base::Value(1), // 'AllowGeolocation'
+ base::Value(2), // 'BlockGeolocation'
+ base::Value(3), // 'AskGeolocation'
};
// The pref is switched off by default.
@@ -4317,8 +4306,7 @@ class ChromeOSPolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kSystemTimezoneAutomaticDetection, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(policy_value),
- nullptr);
+ base::MakeUnique<base::Value>(policy_value), nullptr);
UpdateProviderPolicy(policies);
PrefService* local_state = g_browser_process->local_state();
« no previous file with comments | « chrome/browser/policy/javascript_policy_handler_unittest.cc ('k') | chrome/browser/policy/policy_network_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698