Refactor browser action apitest and port for mac.

BUG=29709
TEST=none  
Review URL: http://codereview.chromium.org/443013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34498 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 20 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/browser_window_controller.h b/chrome/browser/cocoa/browser_window_controller.h
index 988b53f..091babb 100644
--- a/chrome/browser/cocoa/browser_window_controller.h
+++ b/chrome/browser/cocoa/browser_window_controller.h
@@ -217,6 +217,9 @@ class TabStripModelObserverBridge;
 // Return a point suitable for the topLeft for a bookmark bubble.
 - (NSPoint)topLeftForBubble;
 
+// Return a weak pointer to the toolbar controller.
+- (ToolbarController*)toolbarController;
+
 // Resets any saved state about window growth (due to showing the bookmark bar
 // or the download shelf), so that future shrinking will occur from the bottom.
 - (void)resetWindowGrowthState;
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index bb615ac..43416bd 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -789,6 +789,10 @@ willPositionSheet:(NSWindow*)sheet
   return enable;
 }
 
+- (ToolbarController*)toolbarController {
+  return toolbarController_.get();
+}
+
 // Called when the user picks a menu or toolbar item when this window is key.
 // Calls through to the browser object to execute the command. This assumes that
 // the command is supported and doesn't check, otherwise it would have been
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.h b/chrome/browser/cocoa/extensions/browser_actions_controller.h
index cbdc28f..e1c76a9 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.h
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.h
@@ -84,4 +84,8 @@ extern NSString* const kBrowserActionsChangedNotification;
 
 @end  // @interface BrowserActionsController
 
+@interface BrowserActionsController(TestingAPI)
+- (NSButton*)buttonWithIndex:(int)index;
+@end
+
 #endif  // CHROME_BROWSER_COCOA_EXTENSIONS_BROWSER_ACTIONS_CONTROLLER_H_
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
index 6dacbe0..2549267 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
@@ -460,4 +460,8 @@ class ExtensionsServiceObserverBridge : public NotificationObserver {
   return selected_tab->controller().session_id().id();
 }
 
+- (NSButton*)buttonWithIndex:(int)index {
+  return [buttonOrder_ objectAtIndex:(NSUInteger)index];
+}
+
 @end
diff --git a/chrome/browser/cocoa/toolbar_controller.h b/chrome/browser/cocoa/toolbar_controller.h
index dfbe5bf..676b0a8 100644
--- a/chrome/browser/cocoa/toolbar_controller.h
+++ b/chrome/browser/cocoa/toolbar_controller.h
@@ -161,6 +161,7 @@ class ToolbarModel;
 - (gfx::Rect)locationStackBounds;
 // Return a hover button for the current event.
 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
+- (BrowserActionsController*)browserActionsController;
 @end
 
 #endif  // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 8a13f25..937fe43 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -274,6 +274,10 @@ class PrefObserverBridge : public NotificationObserver {
   return nil;
 }
 
+- (BrowserActionsController*)browserActionsController {
+  return browserActionsController_.get();
+}
+
 - (void)mouseMoved:(NSEvent*)theEvent {
   NSButton* targetView = [self hoverButtonForEvent:theEvent];
   if (hoveredButton_ != targetView) {