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

chrome/browser/extensions/browser_action_test_util.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_
 #define CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_
 #pragma once
 
 #include <string>
 
 #include "build/build_config.h"
 
 class Browser;
+class ExtensionAction;
 
 namespace gfx {
 class Rect;
 class Size;
 }  // namespace gfx
 
 class BrowserActionTestUtil {
  public:
   explicit BrowserActionTestUtil(Browser* browser) : browser_(browser) {}
 
   // Returns the number of browser action buttons in the window toolbar.
   int NumberOfBrowserActions();
 
   // Returns the number of browser action currently visible.
   int VisibleBrowserActions();
 
-#if defined(TOOLKIT_VIEWS) && defined(UNIT_TEST)
-  // Waits for a browser action at |index| to get updated.
-  void WaitForBrowserActionUpdated(int index);
+#if defined(TOOLKIT_VIEWS)
+  // Returns the ExtensionAction for the given index.
+  ExtensionAction* GetExtensionAction(int index);
 #endif
 
   // Returns whether the browser action at |index| has a non-null icon. Note
   // that the icon is loaded asynchronously, in which case you can wait for it
   // to load by calling WaitForBrowserActionUpdated.
   bool HasIcon(int index);
 
   // Simulates a user click on the browser action button at |index|.
   void Press(int index);
 
@@ skipping 19 matching lines @@
   static gfx::Size GetMinPopupSize();
 
   // Returns the maximum allowed size of an extension popup.
   static gfx::Size GetMaxPopupSize();
 
  private:
   Browser* browser_;  // weak
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_BROWSER_ACTION_TEST_UTIL_H_