chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc - Issue 1865213004: Convert //chrome/browser/ui 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/ui/search_engines/search_engine_tab_helper_browsertest.cc

Issue 1865213004: Convert //chrome/browser/ui 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/ui/search_engines/search_engine_tab_helper.cc ('k') | chrome/browser/ui/search_engines/template_url_table_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc

diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc

index bb9864f717b9f0081877b75efa918093a679caf7..4ade03fb0fa55838cacb96b97c4ab6e23e61cb56 100644

--- a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc

+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc

@@ -39,7 +39,7 @@ class TemplateURLServiceObserver {

private:

void StopLoop() { runner_->Quit(); }

base::RunLoop* runner_;

- scoped_ptr<TemplateURLService::Subscription> template_url_sub_;

+ std::unique_ptr<TemplateURLService::Subscription> template_url_sub_;

DISALLOW_COPY_AND_ASSIGN(TemplateURLServiceObserver);

};

@@ -64,8 +64,8 @@ class SearchEngineTabHelperBrowserTest : public InProcessBrowserTest {

~SearchEngineTabHelperBrowserTest() override {}

private:

- scoped_ptr<HttpResponse> HandleRequest(const GURL& osdd_xml_url,

- const HttpRequest& request) {

+ std::unique_ptr<HttpResponse> HandleRequest(const GURL& osdd_xml_url,

+ const HttpRequest& request) {

std::string html = base::StringPrintf(

"<html>"

"<head>"

@@ -76,7 +76,7 @@ class SearchEngineTabHelperBrowserTest : public InProcessBrowserTest {

"</html>",

osdd_xml_url.spec().c_str());

- scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());

+ std::unique_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());

http_response->set_code(net::HTTP_OK);

http_response->set_content(html);

http_response->set_content_type("text/html");