ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h - Issue 1861593005: Convert //ios 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: ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h

Issue 1861593005: Convert //ios 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 | « ios/chrome/browser/web_resource/web_resource_util_unittest.cc ('k') | ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h

diff --git a/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h b/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h

index b457384deb874f1a748dca6960d44683b1468620..18b57e586498e2791a5af6d7437cc4f838f32d4a 100644

--- a/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h

+++ b/ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h

@@ -5,8 +5,9 @@

#ifndef IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_

#define IOS_CHROME_TEST_IOS_CHROME_SCOPED_TESTING_CHROME_BROWSER_PROVIDER_H_

+#include <memory>

#include "base/macros.h"

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

namespace ios {

class ChromeBrowserProvider;

@@ -17,11 +18,11 @@ class ChromeBrowserProvider;

class IOSChromeScopedTestingChromeBrowserProvider {

public:

explicit IOSChromeScopedTestingChromeBrowserProvider(

- scoped_ptr<ios::ChromeBrowserProvider> chrome_browser_provider);

+ std::unique_ptr<ios::ChromeBrowserProvider> chrome_browser_provider);

~IOSChromeScopedTestingChromeBrowserProvider();

private:

- scoped_ptr<ios::ChromeBrowserProvider> chrome_browser_provider_;

+ std::unique_ptr<ios::ChromeBrowserProvider> chrome_browser_provider_;

ios::ChromeBrowserProvider* original_chrome_browser_provider_;

DISALLOW_COPY_AND_ASSIGN(IOSChromeScopedTestingChromeBrowserProvider);