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

Index: chrome/browser/ui/views/browser_action_test_util_views.cc
===================================================================
--- chrome/browser/ui/views/browser_action_test_util_views.cc	(revision 143189)
+++ chrome/browser/ui/views/browser_action_test_util_views.cc	(working copy)
@@ -11,12 +11,6 @@
 #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"
 
@@ -39,13 +33,10 @@
   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()->