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

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
index 7d3474544347e9e52a11c3d86387f6b01be6fbfd..d29e95f22187073c18bac5f699a5880611abbe3e 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
@@ -7,8 +7,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/browser_action_test_util.h"
#include "chrome/browser/extensions/extension_action_test_util.h"
#include "chrome/test/base/browser_with_test_window_test.h"
@@ -94,16 +95,16 @@ class ToolbarActionsBarUnitTest :
// A BrowserActionTestUtil object constructed with the associated
// ToolbarActionsBar.
- scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
+ std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_;
// The overflow container's BrowserActionTestUtil (only non-null if
// |use_redesign| is true).
- scoped_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_;
+ std::unique_ptr<BrowserActionTestUtil> overflow_browser_action_test_util_;
// True if the extension action redesign switch should be enabled.
bool use_redesign_;
- scoped_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_;
+ std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_;
DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest);
};
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h ('k') | chrome/browser/ui/toolbar/toolbar_actions_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698