chrome/browser/chromeos/policy/user_affiliation_browsertest.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/user_affiliation_browsertest.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/upload_job_unittest.cc ('k') | chrome/browser/chromeos/policy/user_cloud_external_data_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4b63296f46cb1330f229c1c8d32fec7efbaeedcc..d7f091e4576532a52014100ade698a1f3b613524 100644

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

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

@@ -2,8 +2,10 @@

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

// found in the LICENSE file.

+#include <memory>

#include "base/macros.h"

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

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

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

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

#include "chromeos/dbus/dbus_thread_manager.h"

@@ -49,7 +51,7 @@ class UserAffiliationBrowserTest

chromeos::FakeSessionManagerClient* fake_session_manager_client =

new chromeos::FakeSessionManagerClient;

chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(

- make_scoped_ptr<chromeos::SessionManagerClient>(

+ base::WrapUnique<chromeos::SessionManagerClient>(

fake_session_manager_client));

UserPolicyBuilder user_policy;