Revert of views: Move MenuButton from TextButton to LabelButton.

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 26 matching lines @@
   return extensions::ExtensionActionManager::Get(browser_->profile())->
       GetBrowserAction(*GetContainer(browser_)->GetBrowserActionViewAt(index)->
                        button()->extension());
 }
 
 void BrowserActionTestUtil::InspectPopup(int index) {
   GetContainer(browser_)->InspectPopup(GetExtensionAction(index));
 }
 
 bool BrowserActionTestUtil::HasIcon(int index) {
-  return !GetContainer(browser_)->GetBrowserActionViewAt(index)->button()->
-      GetImage(views::Button::STATE_NORMAL).isNull();
+  return GetContainer(browser_)->GetBrowserActionViewAt(index)->button()->
+      HasIcon();
 }
 
 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);
@@ skipping 33 matching lines @@
   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);
 }