chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

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/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/remote_commands/screenshot_delegate.cc ('k') | chrome/browser/chromeos/policy/server_backed_state_keys_broker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc b/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

index 285c3a0ad19f816f94548b2ad5d7aaddf2438926..0edb1db4c07aabd8947482b36d8edbe06c9bd704 100644

--- a/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

+++ b/chrome/browser/chromeos/policy/restore_on_startup_browsertest_chromeos.cc

@@ -2,11 +2,11 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include <memory>

#include <utility>

#include "base/command_line.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/values.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/policy/login_policy_test_base.h"

@@ -58,7 +58,7 @@ void RestoreOnStartupTestChromeOS::GetMandatoryPoliciesValue(

base::DictionaryValue* policy) const {

policy->SetInteger(key::kRestoreOnStartup,

SessionStartupPref::kPrefValueURLs);

- scoped_ptr<base::ListValue> urls(new base::ListValue);

+ std::unique_ptr<base::ListValue> urls(new base::ListValue);

urls->AppendString(kStartUpURL1);

urls->AppendString(kStartUpURL2);

policy->Set(key::kRestoreOnStartupURLs, std::move(urls));