content/test/content_test_suite.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/test/content_test_suite.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: 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/test/content_test_launcher.cc ('k') | content/test/dwrite_font_fake_sender_win.h » ('j') | extensions/shell/browser/shell_url_request_context_getter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/content_test_suite.h

diff --git a/content/test/content_test_suite.h b/content/test/content_test_suite.h

index cb3703381fa1042ce57714af4d8b6e42d76bffa0..989153f1c5a481353967fe8538f4b45ee5893a4b 100644

--- a/content/test/content_test_suite.h

+++ b/content/test/content_test_suite.h

@@ -5,9 +5,10 @@

#ifndef CONTENT_TEST_CONTENT_TEST_SUITE_H_

#define CONTENT_TEST_CONTENT_TEST_SUITE_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "build/build_config.h"

#include "content/public/test/content_test_suite_base.h"

@@ -36,7 +37,7 @@ class ContentTestSuite : public ContentTestSuiteBase {

base::win::ScopedCOMInitializer com_initializer_;

#endif

#if defined(USE_OZONE)

- scoped_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;

+ std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;

#endif

DISALLOW_COPY_AND_ASSIGN(ContentTestSuite);