content/shell/browser/layout_test/layout_test_url_request_context_getter.h - Issue 1874903002: Convert //content 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: content/shell/browser/layout_test/layout_test_url_request_context_getter.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix indent 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 | « content/shell/browser/layout_test/layout_test_notification_manager.cc ('k') | content/shell/browser/layout_test/layout_test_url_request_context_getter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/layout_test/layout_test_url_request_context_getter.h

diff --git a/content/shell/browser/layout_test/layout_test_url_request_context_getter.h b/content/shell/browser/layout_test/layout_test_url_request_context_getter.h

index 0f5572c99206c0058b53f7b8b01dd3ac9cdbe255..41cdae20821f954b03a4bc67fd9d4f177d2ac2f6 100644

--- a/content/shell/browser/layout_test/layout_test_url_request_context_getter.h

+++ b/content/shell/browser/layout_test/layout_test_url_request_context_getter.h

@@ -5,11 +5,12 @@

#ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GETTER_H_

#define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_URL_REQUEST_CONTEXT_GETTER_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/files/file_path.h"

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

#include "content/public/browser/content_browser_client.h"

#include "content/shell/browser/shell_url_request_context_getter.h"

#include "net/url_request/url_request_job_factory.h"

@@ -44,9 +45,9 @@ class LayoutTestURLRequestContextGetter : public ShellURLRequestContextGetter {

~LayoutTestURLRequestContextGetter() override;

// ShellURLRequestContextGetter implementation.

- scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;

- scoped_ptr<net::ProxyConfigService> GetProxyConfigService() override;

- scoped_ptr<net::ProxyService> GetProxyService() override;

+ std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;

+ std::unique_ptr<net::ProxyConfigService> GetProxyConfigService() override;

+ std::unique_ptr<net::ProxyService> GetProxyService() override;

private:

DISALLOW_COPY_AND_ASSIGN(LayoutTestURLRequestContextGetter);