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

Unified Diff: ash/test/content/test_shell_content_state.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/test/ash_test_helper_unittest.cc ('k') | ash/test/display_manager_test_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ash/test/ash_test_helper_unittest.cc ('k') | ash/test/display_manager_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698