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

Unified Diff: ash/test/ash_test_helper.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_base.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 25553f28d4ebbb33ccfa56d6334b444178339cd6..dcc40968a960b00fbe0b64a229baf3a50d0004e9 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -5,9 +5,10 @@
#ifndef ASH_TEST_ASH_TEST_HELPER_H_
#define ASH_TEST_ASH_TEST_HELPER_H_
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace aura {
class Window;
@@ -84,12 +85,12 @@ class AshTestHelper {
private:
base::MessageLoopForUI* message_loop_; // Not owned.
TestShellDelegate* test_shell_delegate_; // Owned by ash::Shell.
- scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
+ std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
// Owned by ash::AcceleratorController
TestScreenshotDelegate* test_screenshot_delegate_;
- scoped_ptr<views::ViewsDelegate> views_delegate_;
+ std::unique_ptr<views::ViewsDelegate> views_delegate_;
// An implementation of ShellContentState supplied by the user prior to
// SetUp().
« no previous file with comments | « ash/test/ash_test_base.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698