Make a platform-independent ToolbarActionViewController

chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/extensions/browser_action_test_util.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
@@ skipping 37 matching lines @@
   base::mac::NSObjectRetain(ns_image);
   return gfx::Image(ns_image);
 }
 
 void BrowserActionTestUtil::Press(int index) {
   NSButton* button = GetButton(browser_, index);
   [button performClick:nil];
 }
 
 std::string BrowserActionTestUtil::GetExtensionId(int index) {
-  return [GetButton(browser_, index) extension]->id();
+  return [GetButton(browser_, index) viewController]->GetId();
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   NSString* tooltip = [GetButton(browser_, index) toolTip];
   return base::SysNSStringToUTF8(tooltip);
 }
 
 gfx::NativeView BrowserActionTestUtil::GetPopupNativeView() {
   return [[ExtensionPopupController popup] view];
 }
@@ skipping 26 matching lines @@
 
 // static
 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
   return gfx::Size(NSSizeToCGSize([ExtensionPopupController minPopupSize]));
 }
 
 // static
 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
   return gfx::Size(NSSizeToCGSize([ExtensionPopupController maxPopupSize]));
 }