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

Unified Diff: chrome/browser/ui/toolbar/browser_actions_bar_browsertest.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/browser_actions_bar_browsertest.h
diff --git a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
index d81440740bd422f37e10c6aba84da4b5d0352efa..795be8238d7cb23957ed35506864d4c648354f5e 100644
--- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
+++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
@@ -5,9 +5,10 @@
#ifndef CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_
#define CHROME_BROWSER_UI_TOOLBAR_BROWSER_ACTIONS_BAR_BROWSERTEST_H_
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "extensions/common/feature_switch.h"
@@ -50,10 +51,10 @@ class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
protected:
// Enable or disable the feature redesign switch.
- scoped_ptr<extensions::FeatureSwitch::ScopedOverride> override_redesign_;
+ std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> override_redesign_;
private:
- scoped_ptr<BrowserActionTestUtil> browser_actions_bar_;
+ std::unique_ptr<BrowserActionTestUtil> browser_actions_bar_;
// The associated toolbar model, weak.
ToolbarActionsModel* toolbar_model_;

Powered by Google App Engine
This is Rietveld 408576698