Get rid of the multiple includes of browser_action_test_util files in browser.lib and browser_tests…

chrome/browser/ui/views/browser_action_test_util_views.cc

 // Copyright (c) 2011 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/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/browser_action_view.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
-
-#ifdef UNIT_TEST
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-#endif  // UNIT_TEST
-
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace {
 
 BrowserActionsContainer* GetContainer(Browser* browser) {
   BrowserActionsContainer* container =
       browser->window()->GetBrowserWindowTesting()->GetToolbarView()->
           browser_actions();
   return container;
 }
 
 }  // namespace
 
 int BrowserActionTestUtil::NumberOfBrowserActions() {
   return GetContainer(browser_)->num_browser_actions();
 }
 
 int BrowserActionTestUtil::VisibleBrowserActions() {
   return GetContainer(browser_)->VisibleBrowserActions();
 }
 
-#ifdef UNIT_TEST
-void BrowserActionTestUtil::WaitForBrowserActionUpdated(int index) {
-  ui_test_utils::WaitForBrowserActionUpdated(
-      GetContainer(browser_)->GetBrowserActionViewAt(index)->
-          button()->extension()->browser_action());
+ExtensionAction* BrowserActionTestUtil::GetExtensionAction(int index) {
+  return GetContainer(browser_)->GetBrowserActionViewAt(index)->
+          button()->extension()->browser_action();
 }
-#endif  // UNIT_TEST
 
 bool BrowserActionTestUtil::HasIcon(int index) {
   return GetContainer(browser_)->GetBrowserActionViewAt(index)->button()->
       HasIcon();
 }
 
 void BrowserActionTestUtil::Press(int index) {
   GetContainer(browser_)->TestExecuteBrowserAction(index);
 }
 
@@ skipping 28 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);
 }