| Index: ash/test/content/test_shell_content_state.h
|
| diff --git a/ash/test/content/test_shell_content_state.h b/ash/test/content/test_shell_content_state.h
|
| index d8c5ac71881581e9ac8bb742361162d2bb716a26..ed15b78f50c88d0173e7c1f71c3f4d1cd7935f58 100644
|
| --- a/ash/test/content/test_shell_content_state.h
|
| +++ b/ash/test/content/test_shell_content_state.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
|
| #define ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/content/shell_content_state.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
|
|
| namespace content {
|
| class BrowserContext;
|
| @@ -37,7 +38,7 @@ class TestShellContentState : public ShellContentState {
|
| content::BrowserContext* GetUserPresentingBrowserContextForWindow(
|
| aura::Window* window) override;
|
|
|
| - scoped_ptr<content::BrowserContext> active_browser_context_;
|
| + std::unique_ptr<content::BrowserContext> active_browser_context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestShellContentState);
|
| };
|
|
|