Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
@@ skipping 57 matching lines @@
       const char* expected_names[],
       size_t total_size,
       size_t visible_count) WARN_UNUSED_RESULT;
 
   ToolbarActionsBar* toolbar_actions_bar() {
     return browser_action_test_util_->GetToolbarActionsBar();
   }
   ToolbarActionsBar* overflow_bar() {
     return overflow_browser_action_test_util_->GetToolbarActionsBar();
   }
-  extensions::ExtensionToolbarModel* toolbar_model() {
-    return toolbar_model_;
-  }
+  ToolbarActionsModel* toolbar_model() { return toolbar_model_; }
   BrowserActionTestUtil* browser_action_test_util() {
     return browser_action_test_util_.get();
   }
   BrowserActionTestUtil* overflow_browser_action_test_util() {
     return overflow_browser_action_test_util_.get();
   }
 
  private:
-  // The associated ExtensionToolbarModel (owned by the keyed service setup).
-  extensions::ExtensionToolbarModel* toolbar_model_;
+  // The associated ToolbarActionsModel (owned by the keyed service setup).
+  ToolbarActionsModel* toolbar_model_;
 
   // A BrowserActionTestUtil object constructed with the associated
   // ToolbarActionsBar.
   scoped_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_;
 
   // True if the extension action redesign switch should be enabled.
   bool use_redesign_;
 
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> redesign_switch_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarUnitTest);
 };
 
 class ToolbarActionsBarRedesignUnitTest : public ToolbarActionsBarUnitTest {
  public:
   ToolbarActionsBarRedesignUnitTest();
   ~ToolbarActionsBarRedesignUnitTest() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ToolbarActionsBarRedesignUnitTest);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTIONS_BAR_UNITTEST_H_