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

chrome/browser/ui/views/browser_actions_container_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/test/base/ui_test_utils.h"
 
 using extensions::Extension;
 
 class BrowserActionsContainerTest : public ExtensionBrowserTest {
  public:
   BrowserActionsContainerTest() {
   }
   virtual ~BrowserActionsContainerTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     browser_actions_bar_.reset(new BrowserActionTestUtil(browser()));
   }
 
   BrowserActionTestUtil* browser_actions_bar() {
     return browser_actions_bar_.get();
   }
 
   // Make sure extension with index |extension_index| has an icon.
   void EnsureExtensionHasIcon(int extension_index) {
     if (!browser_actions_bar_->HasIcon(extension_index)) {
       // The icon is loaded asynchronously and a notification is then sent to
       // observers. So we wait on it.
-      browser_actions_bar_->WaitForBrowserActionUpdated(extension_index);
+      ExtensionAction* browser_action =
+          browser_actions_bar_->GetExtensionAction(extension_index);
+
+      ui_test_utils::WindowedNotificationObserver observer(
+          chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
+          content::Source<ExtensionAction>(browser_action));
+      observer.Wait();
     }
     EXPECT_TRUE(browser_actions_bar()->HasIcon(extension_index));
   }
 
  private:
   scoped_ptr<BrowserActionTestUtil> browser_actions_bar_;
 };
 
 // Test the basic functionality.
 // http://crbug.com/120770
@@ skipping 222 matching lines @@
       extension->GetResource(extension->browser_action()->default_icon_path()),
       bitmap,
       size);
 
   LOG(INFO) << "Disabling extension\n" << std::flush;
   DisableExtension(extension->id());
   LOG(INFO) << "Enabling extension\n" << std::flush;
   EnableExtension(extension->id());
   LOG(INFO) << "Test ending\n" << std::flush;
 }