content/shell/browser/layout_test/layout_test_browser_main_parts.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_browser_main_parts.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_browser_main.cc ('k') | content/shell/browser/layout_test/layout_test_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e49be866c1f1e0dfe7133dabbfa4afbb05d6d3a9..1622a31fc1e51a9587c0ffd01a7fd17b5949b7fc 100644

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

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

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

#ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_

#define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BROWSER_MAIN_PARTS_H_

+#include <memory>

#include "base/macros.h"

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

#include "build/build_config.h"

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

@@ -38,7 +39,7 @@ class LayoutTestBrowserMainParts : public ShellBrowserMainParts {

void InitializeMessageLoopContext() override;

#if defined(ENABLE_PLUGINS)

- scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;

+ std::unique_ptr<ShellPluginServiceFilter> plugin_service_filter_;

#endif

DISALLOW_COPY_AND_ASSIGN(LayoutTestBrowserMainParts);