Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h

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 dd7290520217794f22fe7a85a1819b3c6b4b3b67..268245a9c98fe8d51a3529495d3c4e0b96faefe6 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h
@@ -75,9 +75,7 @@ class ToolbarActionsBarUnitTest : public BrowserWithTestWindowTest {
   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();
   }
@@ -86,8 +84,8 @@ class ToolbarActionsBarUnitTest : public BrowserWithTestWindowTest {
   }
 
  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.