Index: chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm |
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm |
index 51e9f0fe7d03ee1525c9a646d7b64ff0b462a866..6b8a56cb56028a9a4f5a097437256adce8b36bb9 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm |
@@ -157,11 +157,13 @@ std::string BrowserActionTestUtil::GetTooltip(int index) { |
} |
gfx::NativeView BrowserActionTestUtil::GetPopupNativeView() { |
- return [[ExtensionPopupController popup] view]; |
+ ToolbarActionViewController* popup_owner = |
+ GetToolbarActionsBar()->popup_owner(); |
+ return popup_owner ? popup_owner->GetPopupNativeView() : nil; |
} |
bool BrowserActionTestUtil::HasPopup() { |
- return [ExtensionPopupController popup] != nil; |
+ return GetPopupNativeView() != nil; |
} |
gfx::Size BrowserActionTestUtil::GetPopupSize() { |