Add infrastructure for Chrome Actions

chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

Index: chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
index fcf5fd9b3bd2fa3f54488578b86df087552f3564..3c3014b3015593b24fa29bc38434223687fe1773 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
+++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/browser_window_testing_views.h"
+#include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
@@ -37,13 +38,12 @@ int BrowserActionTestUtil::VisibleBrowserActions() {
 
 ExtensionAction* BrowserActionTestUtil::GetExtensionAction(int index) {
   return extensions::ExtensionActionManager::Get(browser_->profile())->
-      GetBrowserAction(*GetContainer(browser_)->GetBrowserActionViewAt(index)->
-                       extension());
+      GetBrowserAction(*GetContainer(browser_)->GetExtensionAt(index));
 }
 
 void BrowserActionTestUtil::InspectPopup(int index) {
   GetContainer(browser_)->GetBrowserActionViewAt(index)->
-      view_controller()->InspectPopup();
+      GetExtensionActionViewController()->InspectPopup();
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
@@ -63,8 +63,7 @@ void BrowserActionTestUtil::Press(int index) {
 }
 
 std::string BrowserActionTestUtil::GetExtensionId(int index) {
-  return GetContainer(browser_)->GetBrowserActionViewAt(index)->
-      extension()->id();
+  return GetContainer(browser_)->GetExtensionAt(index)->id();
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {