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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/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 ff9bdf7ccc147d8c4b9e143bb20ab930a92fe5b5..f042a0772ac6793a6b65dec0a5f73fdedca2aaf0 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -653,7 +653,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);
}
@@ -808,10 +808,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) {
+ 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,
@@ -903,7 +903,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));
@@ -915,7 +915,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));
@@ -952,7 +952,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);
}
@@ -1000,7 +1000,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);
@@ -1060,7 +1060,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());
@@ -1074,7 +1074,7 @@ 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,
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(3),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(3),
nullptr);
UpdateProviderPolicy(policies);
@@ -1122,16 +1122,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.
@@ -1198,7 +1198,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ForceGoogleSafeSearch) {
nullptr, // ForceSafeSearch
safe_search == 0 // ForceGoogleSafeSearch
? nullptr
- : base::MakeUnique<base::FundamentalValue>(safe_search == 1),
+ : base::MakeUnique<base::Value>(safe_search == 1),
nullptr, // ForceYouTubeSafetyMode
nullptr // ForceYouTubeRestrict
);
@@ -1229,7 +1229,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
PolicyMap policies;
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
UpdateProviderPolicy(policies);
// Crash and reload the tab to get a new renderer.
content::CrashTab(contents);
@@ -1238,7 +1238,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
// Enable with a policy.
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
UpdateProviderPolicy(policies);
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
@@ -1279,7 +1279,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();
@@ -1302,7 +1302,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>(
@@ -1340,7 +1340,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.
@@ -1994,7 +1994,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);
@@ -2013,7 +2013,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, 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());
@@ -2022,7 +2022,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
// Enable via policy and verify that incognito windows can be opened.
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, 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());
@@ -2042,7 +2042,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));
@@ -2060,7 +2060,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),
+ base::MakeUnique<base::Value>(CONTENT_SETTING_ALLOW),
nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
@@ -2077,7 +2077,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));
@@ -2085,7 +2085,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);
@@ -2098,7 +2098,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),
@@ -2111,7 +2111,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.
@@ -2138,7 +2138,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
@@ -2181,7 +2181,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(
@@ -2366,7 +2366,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();
@@ -2381,7 +2381,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 =
@@ -2449,7 +2449,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
@@ -2461,7 +2461,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());
@@ -2496,7 +2496,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),
+ base::MakeUnique<base::Value>(kThreeHoursInMs),
nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2507,7 +2507,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);
@@ -2537,7 +2537,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();
@@ -2547,7 +2547,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)),
+ base::WrapUnique(new base::Value(kOneHourInMs)),
nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2581,10 +2581,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),
+ base::MakeUnique<base::Value>(kThreeHoursInMs),
nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2595,7 +2595,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);
@@ -2615,7 +2615,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());
@@ -2639,7 +2639,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());
@@ -2663,7 +2663,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());
@@ -2687,7 +2687,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());
@@ -2708,7 +2708,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),
+ base::MakeUnique<base::Value>(ash::MAGNIFIER_FULL),
nullptr);
UpdateProviderPolicy(policies);
EXPECT_EQ(ash::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
@@ -2733,7 +2733,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());
@@ -2756,7 +2756,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);
@@ -2766,7 +2766,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);
@@ -2841,7 +2841,7 @@ class RestoreOnStartupPolicyTest
PolicyMap policies;
policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
+ base::WrapUnique(new base::Value(
SessionStartupPref::kPrefValueURLs)),
nullptr);
policies.Set(key::kRestoreOnStartupURLs, POLICY_LEVEL_MANDATORY,
@@ -2855,7 +2855,7 @@ class RestoreOnStartupPolicyTest
PolicyMap policies;
policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
+ base::WrapUnique(new base::Value(
SessionStartupPref::kPrefValueNewTab)),
nullptr);
provider_.UpdateChromePolicy(policies);
@@ -2867,7 +2867,7 @@ class RestoreOnStartupPolicyTest
PolicyMap policies;
policies.Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
+ base::WrapUnique(new base::Value(
SessionStartupPref::kPrefValueLast)),
nullptr);
provider_.UpdateChromePolicy(policies);
@@ -2922,10 +2922,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"),
@@ -2994,7 +2994,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_),
+ base::MakeUnique<base::Value>(policy_value_),
nullptr);
if (whitelist_policy) {
@@ -3223,7 +3223,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;
@@ -3312,7 +3312,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));
@@ -3394,7 +3394,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.
@@ -3442,7 +3442,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.
@@ -3452,7 +3452,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.
@@ -3469,7 +3469,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);
}
};
@@ -3613,7 +3613,7 @@ void ComponentUpdaterPolicyTest::SetEnableComponentUpdates(
policies.Set(
key::kComponentUpdatesEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_ENTERPRISE_DEFAULT,
- base::WrapUnique(new base::FundamentalValue(enable_component_updates)),
+ base::WrapUnique(new base::Value(enable_component_updates)),
nullptr);
UpdateProviderPolicy(policies);
}
@@ -3906,7 +3906,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);
}
};
@@ -3935,12 +3935,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());
}
@@ -3984,7 +3984,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)),
+ base::WrapUnique(new base::Value(enabled)),
nullptr);
UpdateProviderPolicy(policies);
if (browser()) {
@@ -4036,7 +4036,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));
@@ -4044,7 +4044,7 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcBackupRestoreEnabled) {
// Enable ARC Backup & Restore.
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));
@@ -4067,7 +4067,7 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcLocationServiceEnabled) {
// AllowGeolocation
policies.Set(key::kDefaultGeolocationSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(1), nullptr);
+ base::MakeUnique<base::Value>(1), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(pref->GetBoolean(prefs::kArcLocationServiceEnabled));
EXPECT_FALSE(pref->IsManagedPreference(prefs::kArcLocationServiceEnabled));
@@ -4075,7 +4075,7 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcLocationServiceEnabled) {
// BlockGeolocation
policies.Set(key::kDefaultGeolocationSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(2), nullptr);
+ base::MakeUnique<base::Value>(2), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(pref->GetBoolean(prefs::kArcLocationServiceEnabled));
EXPECT_TRUE(pref->IsManagedPreference(prefs::kArcLocationServiceEnabled));
@@ -4083,7 +4083,7 @@ IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcLocationServiceEnabled) {
// AskGeolocation
policies.Set(key::kDefaultGeolocationSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(3), nullptr);
+ base::MakeUnique<base::Value>(3), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(pref->GetBoolean(prefs::kArcLocationServiceEnabled));
EXPECT_FALSE(pref->IsManagedPreference(prefs::kArcLocationServiceEnabled));
@@ -4137,7 +4137,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),
+ base::MakeUnique<base::Value>(policy_value),
nullptr);
UpdateProviderPolicy(policies);
« 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