Move ShowPopup logic from BrowserActionsContainer to BrowserActionView

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

 // Copyright 2013 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/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 23 matching lines @@
   return GetContainer(browser_)->VisibleBrowserActions();
 }
 
 ExtensionAction* BrowserActionTestUtil::GetExtensionAction(int index) {
   return extensions::ExtensionActionManager::Get(browser_->profile())->
       GetBrowserAction(*GetContainer(browser_)->GetBrowserActionViewAt(index)->
                        button()->extension());
 }
 
 void BrowserActionTestUtil::InspectPopup(int index) {
-  GetContainer(browser_)->InspectPopup(GetExtensionAction(index));
+  BrowserActionButton* button =
+      GetContainer(browser_)->GetBrowserActionViewAt(index)->button();
+  static_cast<ExtensionContextMenuModel::PopupDelegate*>(button)->InspectPopup(
+      button->browser_action());
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
   return !GetContainer(browser_)->GetBrowserActionViewAt(index)->button()->
       GetImage(views::Button::STATE_NORMAL).isNull();
 }
 
 gfx::Image BrowserActionTestUtil::GetIcon(int index) {
   gfx::ImageSkia icon = GetContainer(browser_)->GetBrowserActionViewAt(index)->
       button()->GetIconForTest();
   return gfx::Image(icon);
 }
 
 void BrowserActionTestUtil::Press(int index) {
-  GetContainer(browser_)->TestExecuteBrowserAction(index);
+  GetContainer(browser_)->GetBrowserActionViewAt(index)
+      ->button()->ExecuteBrowserAction();

[Peter Kasting, 2014/07/26 02:33:20]

Nit: Personally, "operators go on the ends of lines" suggests to me that we
should wrap after ->, and not before (or wrap before one of the function
arguments, or something)

[Devlin, 2014/07/29 19:07:14]

Yeah, git cl format formed a bad habit before we decided we didn't trust it. 
Done.

 }
 
 std::string BrowserActionTestUtil::GetExtensionId(int index) {
   BrowserActionButton* button =
       GetContainer(browser_)->GetBrowserActionViewAt(index)->button();
   return button->extension()->id();
 }
 
 std::string BrowserActionTestUtil::GetTooltip(int index) {
   base::string16 text;
   GetContainer(browser_)->GetBrowserActionViewAt(index)->button()->
     GetTooltipText(gfx::Point(), &text);
   return base::UTF16ToUTF8(text);
 }
 
 gfx::NativeView BrowserActionTestUtil::GetPopupNativeView() {
   return GetContainer(browser_)->TestGetPopup()->GetWidget()->GetNativeView();
 }
 
 bool BrowserActionTestUtil::HasPopup() {
   return GetContainer(browser_)->TestGetPopup() != NULL;
 }
 
 gfx::Rect BrowserActionTestUtil::GetPopupBounds() {
   return GetContainer(browser_)->TestGetPopup()->bounds();
 }
 
 bool BrowserActionTestUtil::HidePopup() {
-  GetContainer(browser_)->HidePopup();
+  GetContainer(browser_)->HideActivePopup();
   return !HasPopup();
 }
 
 void BrowserActionTestUtil::SetIconVisibilityCount(size_t icons) {
   GetContainer(browser_)->TestSetIconVisibilityCount(icons);
 }
 
 gfx::Size BrowserActionTestUtil::GetMinPopupSize() {
   return gfx::Size(ExtensionPopup::kMinWidth, ExtensionPopup::kMinHeight);
 }
 
 gfx::Size BrowserActionTestUtil::GetMaxPopupSize() {
   return gfx::Size(ExtensionPopup::kMaxWidth, ExtensionPopup::kMaxHeight);
 }