Index: chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm |
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm |
index 6d714d33c409b83cee09287d12d6cc4f6555566e..4051cc15a8f31f27cb83b0c9f8aa069982b94d64 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm |
@@ -2,13 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
+ |
#import <Cocoa/Cocoa.h> |
+#include <memory> |
+ |
#include "base/bind.h" |
#include "base/callback.h" |
#include "base/callback_helpers.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -16,12 +19,11 @@ |
#include "chrome/browser/extensions/extension_browsertest.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/ui/browser_window.h" |
-#import "chrome/browser/ui/cocoa/run_loop_testing.h" |
#import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" |
#import "chrome/browser/ui/cocoa/browser_window_controller.h" |
-#import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
#import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" |
#import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" |
+#import "chrome/browser/ui/cocoa/run_loop_testing.h" |
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" |
#include "chrome/browser/ui/global_error/global_error.h" |
#include "chrome/browser/ui/global_error/global_error_service.h" |
@@ -227,7 +229,7 @@ class BrowserActionButtonUiTest : public ExtensionBrowserTest { |
NSView* appMenuButton() { return [toolbarController_ appMenuButton]; } |
private: |
- scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_; |
+ std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_; |
ToolbarController* toolbarController_ = nil; |
AppMenuController* appMenuController_ = nil; |