Index: content/public/test/test_content_client_initializer.h |
diff --git a/content/public/test/test_content_client_initializer.h b/content/public/test/test_content_client_initializer.h |
index ff517c090489c43307b912b85cc123dd561d3f7c..e8371b497271d97fc5247de8d0c0955fbf944898 100644 |
--- a/content/public/test/test_content_client_initializer.h |
+++ b/content/public/test/test_content_client_initializer.h |
@@ -5,8 +5,9 @@ |
#ifndef CONTENT_PUBLIC_TEST_TEST_CONTENT_CLIENT_INITIALIZER_H_ |
#define CONTENT_PUBLIC_TEST_TEST_CONTENT_CLIENT_INITIALIZER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
namespace content { |
@@ -30,11 +31,11 @@ class TestContentClientInitializer { |
void CreateTestRenderViewHosts(); |
private: |
- scoped_ptr<NotificationServiceImpl> notification_service_; |
- scoped_ptr<ContentClient> content_client_; |
- scoped_ptr<TestContentBrowserClient> content_browser_client_; |
- scoped_ptr<MockRenderProcessHostFactory> rph_factory_; |
- scoped_ptr<TestRenderViewHostFactory> test_render_view_host_factory_; |
+ std::unique_ptr<NotificationServiceImpl> notification_service_; |
+ std::unique_ptr<ContentClient> content_client_; |
+ std::unique_ptr<TestContentBrowserClient> content_browser_client_; |
+ std::unique_ptr<MockRenderProcessHostFactory> rph_factory_; |
+ std::unique_ptr<TestRenderViewHostFactory> test_render_view_host_factory_; |
DISALLOW_COPY_AND_ASSIGN(TestContentClientInitializer); |
}; |