Support Component Actions in the toolbar.

chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/browser_window.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/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "extensions/common/feature_switch.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
 namespace {
 
 const int kMenuPadding = 26;
 
 // A simple error class that has a menu item.
 class MenuError : public GlobalError {
@@ skipping 95 matching lines @@
 
   void SetUpOnMainThread() override {
     ExtensionBrowserTest::SetUpOnMainThread();
     toolbarController_ =
         [[BrowserWindowController
             browserWindowControllerForWindow:browser()->
                 window()->GetNativeWindow()]
             toolbarController];
     ASSERT_TRUE(toolbarController_);
     wrenchMenuController_ = [toolbarController_ wrenchMenuController];
-    model_ = extensions::ExtensionToolbarModel::Get(profile());
+    model_ = ToolbarActionsModel::Get(profile());
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
         extensions::FeatureSwitch::extension_action_redesign(), true));
     ToolbarActionsBar::disable_animations_for_testing_ = true;
   }
 
   void TearDownOnMainThread() override {
     enable_redesign_.reset();
     ToolbarActionsBar::disable_animations_for_testing_ = false;
     ExtensionBrowserTest::TearDownOnMainThread();
   }
 
   ToolbarController* toolbarController() { return toolbarController_; }
   WrenchMenuController* wrenchMenuController() { return wrenchMenuController_; }
-  extensions::ExtensionToolbarModel* model() { return model_; }
+  ToolbarActionsModel* model() { return model_; }
   NSView* wrenchButton() { return [toolbarController_ wrenchButton]; }
 
  private:
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
 
   ToolbarController* toolbarController_ = nil;
   WrenchMenuController* wrenchMenuController_ = nil;
-  extensions::ExtensionToolbarModel* model_ = nullptr;
+  ToolbarActionsModel* model_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButtonUiTest);
 };
 
 // Simulates a clicks on the action button in the overflow menu, and runs
 // |closure| upon completion.
 void ClickOnOverflowedAction(ToolbarController* toolbarController,
                              const base::Closure& closure) {
   WrenchMenuController* wrenchMenuController =
       [toolbarController wrenchMenuController];
@@ skipping 223 matching lines @@
       GlobalErrorServiceFactory::GetForProfile(profile());
   error_service->AddGlobalError(new MenuError());
 
   // It's probably excessive to test every level of the overflow here. Test
   // having all actions overflowed, some actions overflowed, and one action
   // overflowed.
   resizeAndActivateWrench(kNumExtensions, "GlobalError Full");
   resizeAndActivateWrench(kNumExtensions / 2, "GlobalError Half");
   resizeAndActivateWrench(1, "GlobalError One");
 }