| Index: content/shell/renderer/layout_test/layout_test_content_renderer_client.h
|
| diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.h b/content/shell/renderer/layout_test/layout_test_content_renderer_client.h
|
| index 574802438add4835d6f092091d997797eda62fa7..b7bc9bb27a06a1cca27e7f7d6f989c75e79533bc 100644
|
| --- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.h
|
| +++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_RENDERER_CLIENT_H_
|
| #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_LAYOUT_TEST_CONTENT_RENDERER_CLIENT_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "content/shell/renderer/shell_content_renderer_client.h"
|
|
|
| namespace content {
|
| @@ -31,14 +32,14 @@ class LayoutTestContentRendererClient : public ShellContentRendererClient {
|
| blink::WebAudioDevice* OverrideCreateAudioDevice(double sample_rate) override;
|
| blink::WebClipboard* OverrideWebClipboard() override;
|
| blink::WebThemeEngine* OverrideThemeEngine() override;
|
| - scoped_ptr<blink::WebAppBannerClient> CreateAppBannerClient(
|
| + std::unique_ptr<blink::WebAppBannerClient> CreateAppBannerClient(
|
| RenderFrame* render_frame) override;
|
| - scoped_ptr<MediaStreamRendererFactory> CreateMediaStreamRendererFactory()
|
| + std::unique_ptr<MediaStreamRendererFactory> CreateMediaStreamRendererFactory()
|
| override;
|
|
|
| private:
|
| - scoped_ptr<LayoutTestRenderProcessObserver> shell_observer_;
|
| - scoped_ptr<MockWebClipboardImpl> clipboard_;
|
| + std::unique_ptr<LayoutTestRenderProcessObserver> shell_observer_;
|
| + std::unique_ptr<MockWebClipboardImpl> clipboard_;
|
| };
|
|
|
| } // namespace content
|
|
|