Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h

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 58baa2884135718a707d675d93fee6e0b51f6bb2..3dcf83cf7a4c029d59a9d7735c2b91f1d8d45fec 100644
--- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
+++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h
@@ -13,10 +13,10 @@
 
 namespace extensions {
 class Extension;
-class ExtensionToolbarModel;
 }
 
 class BrowserActionTestUtil;
+class ToolbarActionsModel;
 
 // A platform-independent browser test class for the browser actions bar.
 class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
@@ -31,7 +31,7 @@ class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
   BrowserActionTestUtil* browser_actions_bar() {
     return browser_actions_bar_.get();
   }
-  extensions::ExtensionToolbarModel* toolbar_model() { return toolbar_model_; }
+  ToolbarActionsModel* toolbar_model() { return toolbar_model_; }
 
   // Creates three different extensions, each with a browser action, and adds
   // them to associated ExtensionService. These can then be accessed via
@@ -52,7 +52,7 @@ class BrowserActionsBarBrowserTest : public ExtensionBrowserTest {
   scoped_ptr<BrowserActionTestUtil> browser_actions_bar_;
 
   // The associated toolbar model, weak.
-  extensions::ExtensionToolbarModel* toolbar_model_;
+  ToolbarActionsModel* toolbar_model_;
 
   // Extensions with browser actions used for testing.
   scoped_refptr<const extensions::Extension> extension_a_;