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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 years, 3 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') | 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 3bef5a61ae4cfd6ad74416f908c30df21ede6bb0..c3a4dfa8cd7810e9bf3f07d55209b1279f6243ca 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -725,8 +725,7 @@ class PolicyTest : public InProcessBrowserTest {
PolicyMap policies;
policies.Set(key::kDisableScreenshots, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(!enabled)),
- nullptr);
+ base::MakeUnique<base::FundamentalValue>(!enabled), nullptr);
UpdateProviderPolicy(policies);
}
@@ -934,7 +933,7 @@ class LocalePolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kApplicationLocaleValue, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("fr")), nullptr);
+ base::MakeUnique<base::StringValue>("fr"), nullptr);
provider_.UpdateChromePolicy(policies);
// The "en-US" ResourceBundle is always loaded before this step for tests,
// but in this test we want the browser to load the bundle as it
@@ -973,7 +972,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
PolicyMap policies;
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));
EXPECT_TRUE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
@@ -985,7 +984,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(prefs->IsManagedPreference(bookmarks::prefs::kShowBookmarkBar));
EXPECT_FALSE(prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar));
@@ -1022,7 +1021,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::WrapUnique(new base::FundamentalValue(4)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(4), nullptr);
UpdateProviderPolicy(policies);
}
@@ -1070,37 +1069,36 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DefaultSearchProvider) {
PolicyMap policies;
policies.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kKeyword)), nullptr);
+ base::MakeUnique<base::StringValue>(kKeyword), nullptr);
policies.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
+ base::MakeUnique<base::StringValue>(kSearchURL), nullptr);
policies.Set(key::kDefaultSearchProviderInstantURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kInstantURL)), nullptr);
+ base::MakeUnique<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,
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::kDefaultSearchProviderSearchTermsReplacementKey,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::StringValue>(kSearchTermsReplacementKey),
+ nullptr);
policies.Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kImageURL)), nullptr);
+ base::MakeUnique<base::StringValue>(kImageURL), nullptr);
policies.Set(key::kDefaultSearchProviderImageURLPostParams,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kImageURLPostParams)),
+ base::MakeUnique<base::StringValue>(kImageURLPostParams),
nullptr);
policies.Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kNewTabURL)), nullptr);
+ base::MakeUnique<base::StringValue>(kNewTabURL), nullptr);
UpdateProviderPolicy(policies);
default_search = service->GetDefaultSearchProvider();
ASSERT_TRUE(default_search);
@@ -1131,7 +1129,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::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
EXPECT_TRUE(service->GetDefaultSearchProvider());
UpdateProviderPolicy(policies);
EXPECT_FALSE(service->GetDefaultSearchProvider());
@@ -1145,8 +1143,8 @@ 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::WrapUnique(new base::FundamentalValue(3)), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(3),
+ nullptr);
UpdateProviderPolicy(policies);
// It should be removed and replaced with a dictionary.
@@ -1189,11 +1187,11 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ForceSafeSearch) {
// Override the default SafeSearch setting using policies.
ApplySafeSearchPolicy(
legacy == 0 ? nullptr
- : base::WrapUnique(new base::FundamentalValue(legacy == 1)),
+ : base::MakeUnique<base::FundamentalValue>(legacy == 1),
google == 0 ? nullptr
- : base::WrapUnique(new base::FundamentalValue(google == 1)),
- youtube == 0 ? nullptr : base::WrapUnique(
- new base::FundamentalValue(youtube == 1)));
+ : base::MakeUnique<base::FundamentalValue>(google == 1),
+ youtube == 0 ? nullptr
+ : base::MakeUnique<base::FundamentalValue>(youtube == 1));
// The legacy policy should only have an effect if both google and youtube
// are undefined.
@@ -1229,7 +1227,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Disable3DAPIs) {
PolicyMap policies;
policies.Set(key::kDisable3DAPIs, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
// Crash and reload the tab to get a new renderer.
content::CrashTab(contents);
@@ -1238,7 +1236,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::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
content::CrashTab(contents);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_RELOAD));
@@ -1430,7 +1428,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AlwaysAuthorizePlugins) {
PolicyMap policies;
policies.Set(key::kAlwaysAuthorizePlugins, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
// Reloading the page shouldn't trigger the infobar this time.
ui_test_utils::NavigateToURL(browser(), url);
@@ -1454,7 +1452,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) {
PolicyMap policies;
policies.Set(key::kDeveloperToolsDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
content::WindowedNotificationObserver close_observer(
content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
content::Source<content::WebContents>(
@@ -1523,11 +1521,10 @@ 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,
- base::WrapUnique(new base::StringValue(forced_dir.path().value())),
- nullptr);
+ policies.Set(key::kDownloadDirectory, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::StringValue>(forced_dir.path().value()),
+ nullptr);
UpdateProviderPolicy(policies);
DownloadAndVerifyFile(browser(), forced_dir.path(), file);
// Verify that the first download location wasn't affected.
@@ -2135,11 +2132,10 @@ 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,
- base::WrapUnique(new base::StringValue(chrome::kChromeUICreditsURL)),
- nullptr);
+ policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::StringValue>(chrome::kChromeUICreditsURL),
+ nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
content::WaitForLoadStop(contents);
@@ -2147,7 +2143,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
policies.Set(key::kHomepageIsNewTabPage, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
content::WaitForLoadStop(contents);
@@ -2166,7 +2162,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
PolicyMap policies;
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(1u, active_browser_list->size());
@@ -2175,7 +2171,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::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
EXPECT_EQ(2u, active_browser_list->size());
@@ -2195,7 +2191,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
PolicyMap policies;
policies.Set(key::kJavascriptEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
// Reload the page.
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
@@ -2211,11 +2207,10 @@ 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,
- base::WrapUnique(new base::FundamentalValue(CONTENT_SETTING_ALLOW)),
- nullptr);
+ policies.Set(key::kDefaultJavaScriptSetting, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::FundamentalValue>(CONTENT_SETTING_ALLOW),
+ nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
EXPECT_TRUE(IsJavascriptEnabled(contents));
@@ -2231,7 +2226,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, NetworkPrediction) {
PolicyMap policies;
policies.Set(key::kDnsPrefetchingEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(IsNetworkPredictionEnabled(prefs));
@@ -2239,8 +2234,8 @@ 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::WrapUnique(new base::FundamentalValue(
- chrome_browser_net::NETWORK_PREDICTION_ALWAYS)),
+ base::MakeUnique<base::FundamentalValue>(
+ chrome_browser_net::NETWORK_PREDICTION_ALWAYS),
nullptr);
UpdateProviderPolicy(policies);
@@ -2252,7 +2247,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SavingBrowserHistoryDisabled) {
PolicyMap policies;
policies.Set(key::kSavingBrowserHistoryDisabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
GURL url = ui_test_utils::GetTestUrl(
base::FilePath(base::FilePath::kCurrentDirectory),
@@ -2265,7 +2260,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::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
ui_test_utils::NavigateToURL(browser(), url);
// Verify that the navigation was saved in the history.
@@ -2520,7 +2515,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedBrowser) {
PolicyMap policies;
policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
BrowserWindow* browser_window = browser()->window();
@@ -2535,7 +2530,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, FullscreenAllowedApp) {
PolicyMap policies;
policies.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
const extensions::Extension* extension =
@@ -2604,7 +2599,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DisableAudioOutput) {
PolicyMap policies;
policies.Set(key::kAudioOutputAllowed, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(audio_handler->IsOutputMuted());
// This should not change the state now and should not trigger output mute
@@ -2616,7 +2611,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::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(audio_handler->IsOutputMuted());
EXPECT_EQ(1, test_observer->output_mute_changed_count());
@@ -2651,7 +2646,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SessionLengthLimit) {
PolicyMap policies;
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(kThreeHoursInMs)),
+ base::MakeUnique<base::FundamentalValue>(kThreeHoursInMs),
nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2662,8 +2657,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::WrapUnique(new base::FundamentalValue(kOneHourInMs)),
- nullptr);
+ base::MakeUnique<base::FundamentalValue>(kOneHourInMs), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2737,10 +2731,10 @@ 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::MakeUnique<base::FundamentalValue>(true), nullptr);
policies.Set(key::kSessionLengthLimit, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(kThreeHoursInMs)),
+ base::MakeUnique<base::FundamentalValue>(kThreeHoursInMs),
nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
@@ -2751,8 +2745,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::WrapUnique(new base::FundamentalValue(kOneHourInMs)),
- nullptr);
+ base::MakeUnique<base::FundamentalValue>(kOneHourInMs), nullptr);
UpdateProviderPolicy(policies);
base::RunLoop().RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
@@ -2772,7 +2765,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, LargeCursorEnabled) {
PolicyMap policies;
policies.Set(key::kLargeCursorEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsLargeCursorEnabled());
@@ -2796,7 +2789,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, SpokenFeedbackEnabled) {
PolicyMap policies;
policies.Set(key::kSpokenFeedbackEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsSpokenFeedbackEnabled());
@@ -2820,7 +2813,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HighContrastEnabled) {
PolicyMap policies;
policies.Set(key::kHighContrastEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsHighContrastEnabled());
@@ -2844,7 +2837,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeNone) {
PolicyMap policies;
policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());
@@ -2863,11 +2856,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,
- base::WrapUnique(new base::FundamentalValue(ash::MAGNIFIER_FULL)),
- nullptr);
+ policies.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::FundamentalValue>(ash::MAGNIFIER_FULL),
+ nullptr);
UpdateProviderPolicy(policies);
EXPECT_EQ(ash::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
@@ -2891,7 +2883,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, AccessibilityVirtualKeyboardEnabled) {
PolicyMap policies;
policies.Set(key::kVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(accessibility_manager->IsVirtualKeyboardEnabled());
@@ -2914,7 +2906,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
PolicyMap policies;
policies.Set(key::kTouchVirtualKeyboardEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
UpdateProviderPolicy(policies);
EXPECT_TRUE(keyboard::IsKeyboardEnabled());
keyboard::SetTouchKeyboardEnabled(false);
@@ -2924,7 +2916,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::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
UpdateProviderPolicy(policies);
EXPECT_FALSE(keyboard::IsKeyboardEnabled());
keyboard::SetTouchKeyboardEnabled(true);
@@ -3080,13 +3072,13 @@ class PolicyStatisticsCollectorTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(true), nullptr);
policies.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<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")),
+ base::MakeUnique<base::StringValue>("http://chromium.org"),
nullptr);
provider_.UpdateChromePolicy(policies);
}
@@ -3152,7 +3144,7 @@ class MediaStreamDevicesControllerBrowserTest
const char* allow_rule) {
policies->Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(policy_value_)),
+ base::MakeUnique<base::FundamentalValue>(policy_value_),
nullptr);
if (whitelist_policy) {
@@ -3383,7 +3375,7 @@ IN_PROC_BROWSER_TEST_F(WebBluetoothPolicyTest, Block) {
PolicyMap policies;
policies.Set(key::kDefaultWebBluetoothGuardSetting, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(2)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(2), nullptr);
UpdateProviderPolicy(policies);
std::string rejection;
@@ -3629,8 +3621,7 @@ class MediaRouterPolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kEnableMediaRouter, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(enable)),
- nullptr);
+ base::MakeUnique<base::FundamentalValue>(enable), nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -3657,11 +3648,10 @@ class WebRtcUdpPortRangePolicyTest : public PolicyTest {
PolicyTest::SetUpInProcessBrowserTestFixture();
PolicyMap policies;
if (enable) {
- policies.Set(
- key::kWebRtcUdpPortRange, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(kTestWebRtcUdpPortRange)),
- nullptr);
+ policies.Set(key::kWebRtcUdpPortRange, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::StringValue>(kTestWebRtcUdpPortRange),
+ nullptr);
}
provider_.UpdateChromePolicy(policies);
}
@@ -3975,8 +3965,7 @@ class PolicyVariationsServiceTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kVariationsRestrictParameter, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("restricted")),
- nullptr);
+ base::MakeUnique<base::StringValue>("restricted"), nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -3989,7 +3978,7 @@ IN_PROC_BROWSER_TEST_F(PolicyVariationsServiceTest, VariationsURLIsValid) {
// builds, so construct a VariationsService locally instead.
std::unique_ptr<variations::VariationsService> service =
variations::VariationsService::CreateForTesting(
- base::WrapUnique(new ChromeVariationsServiceClient()),
+ base::MakeUnique<ChromeVariationsServiceClient>(),
g_browser_process->local_state());
const GURL url = service->GetVariationsServerURL(
@@ -4068,7 +4057,7 @@ class HardwareAccelerationModePolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kHardwareAccelerationModeEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(false), nullptr);
provider_.UpdateChromePolicy(policies);
}
};
@@ -4133,9 +4122,8 @@ class ArcPolicyTest : public PolicyTest {
fake_arc_bridge_instance_.reset(new arc::FakeArcBridgeInstance);
arc::ArcServiceManager::SetArcBridgeServiceForTesting(
- base::WrapUnique(new arc::ArcBridgeServiceImpl(
- base::WrapUnique(new arc::FakeArcBridgeBootstrap(
- fake_arc_bridge_instance_.get())))));
+ base::MakeUnique<arc::ArcBridgeServiceImpl>(base::WrapUnique(
+ new arc::FakeArcBridgeBootstrap(fake_arc_bridge_instance_.get()))));
}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -4298,7 +4286,7 @@ class ChromeOSPolicyTest : public PolicyTest {
PolicyMap policies;
policies.Set(key::kSystemTimezoneAutomaticDetection, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(policy_value)),
+ base::MakeUnique<base::FundamentalValue>(policy_value),
nullptr);
UpdateProviderPolicy(policies);
« no previous file with comments | « chrome/browser/policy/managed_bookmarks_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