Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Unified Diff: content/test/content_test_launcher.cc

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/test/content_browser_test_utils_internal.cc ('k') | content/test/content_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/content_test_launcher.cc
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 72913c86b8d3de70cbe818bf1110dfc1ade483c7..00e121de7a90b82e3c1f91838974f9fa5b24d951 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -40,8 +40,8 @@
namespace content {
#if defined(OS_ANDROID)
-scoped_ptr<base::MessagePump> CreateMessagePumpForUI() {
- return scoped_ptr<base::MessagePump>(new NestedMessagePumpAndroid());
+std::unique_ptr<base::MessagePump> CreateMessagePumpForUI() {
+ return std::unique_ptr<base::MessagePump>(new NestedMessagePumpAndroid());
};
#endif
@@ -89,8 +89,8 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
}
#if defined(OS_ANDROID)
- scoped_ptr<ShellContentClient> content_client_;
- scoped_ptr<ShellContentBrowserClient> browser_content_client_;
+ std::unique_ptr<ShellContentClient> content_client_;
+ std::unique_ptr<ShellContentBrowserClient> browser_content_client_;
#endif
DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite);
« no previous file with comments | « content/test/content_browser_test_utils_internal.cc ('k') | content/test/content_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698