chrome/browser/ui/startup/startup_browser_creator_browsertest.cc - Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_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: another-fix Created 4 years, 7 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/sync/test/integration/two_client_bookmarks_sync_test.cc ('k') | chrome/browser/ui/webui/options/certificate_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

index 558ec61ae850b107733da23f2dc846c482afab40..25f32f247476ca06fbbbb145fe3483f274c7336e 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -10,6 +10,7 @@

#include "base/command_line.h"

#include "base/files/file_path.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/strings/utf_string_conversions.h"

#include "base/test/histogram_tester.h"

#include "build/build_config.h"

@@ -1571,18 +1572,17 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorFirstRunTest,

// * RestoreOnStartup = RestoreOnStartupIsURLs

// * RestoreOnStartupURLs = [ "/title1.html" ]

policy_map_.Set(

- policy::key::kRestoreOnStartup,

- policy::POLICY_LEVEL_MANDATORY,

- policy::POLICY_SCOPE_USER,

- policy::POLICY_SOURCE_CLOUD,

- new base::FundamentalValue(SessionStartupPref::kPrefValueURLs),

- NULL);

+ policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_MANDATORY,

+ policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,

+ base::WrapUnique(

+ new base::FundamentalValue(SessionStartupPref::kPrefValueURLs)),

+ nullptr);

base::ListValue startup_urls;

startup_urls.Append(new base::StringValue(

embedded_test_server()->GetURL("/title1.html").spec()));

policy_map_.Set(policy::key::kRestoreOnStartupURLs,

policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,

- policy::POLICY_SOURCE_CLOUD, startup_urls.DeepCopy(),

+ policy::POLICY_SOURCE_CLOUD, startup_urls.CreateDeepCopy(),

nullptr);

provider_.UpdateChromePolicy(policy_map_);

base::RunLoop().RunUntilIdle();