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

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

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

index 39737c74be4ac5e2d0015c449cfad018ad683549..d7b0316f350404847b4b569e0e189615216fd3e4 100644

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

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

@@ -2,7 +2,9 @@

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

// found in the LICENSE file.

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

+#include <memory>

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_process_platform_part.h"

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

@@ -30,8 +32,7 @@ IN_PROC_BROWSER_TEST_F(DeviceCloudPolicyBrowserTest, Initializer) {

// Initializer is deleted when the manager connects.

connector->GetDeviceCloudPolicyManager()->StartConnection(

- make_scoped_ptr(mock_client_),

- connector->GetInstallAttributes());

+ base::WrapUnique(mock_client_), connector->GetInstallAttributes());

EXPECT_FALSE(connector->GetDeviceCloudPolicyInitializer());

// Initializer is restarted when the manager disconnects.