From 20799ff43165811c4958eae998061f6ca31e1610 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 20 Jun 2012 22:20:01 +0000 Subject: Get rid of the multiple includes of browser_action_test_util files in browser.lib and browser_tests.exe. This is wrong on its own (we shouldn't be compiling code in/out using the UNIT_TEST ifdef). It also allows us to turn on incremental linking for browser_tests. Review URL: https://chromiumcodereview.appspot.com/10592022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143272 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/base/ui_test_utils.cc | 7 ------- chrome/test/base/ui_test_utils.h | 4 ---- 2 files changed, 11 deletions(-) (limited to 'chrome/test/base') diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 09702cb..bca4d5f 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -342,13 +342,6 @@ void WaitForNewTab(Browser* browser) { observer.Wait(); } -void WaitForBrowserActionUpdated(ExtensionAction* browser_action) { - WindowedNotificationObserver observer( - chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED, - content::Source(browser_action)); - observer.Wait(); -} - void WaitForLoadStop(WebContents* tab) { WindowedNotificationObserver load_stop_observer( content::NOTIFICATION_LOAD_STOP, diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h index d16274a..4e2644d 100644 --- a/chrome/test/base/ui_test_utils.h +++ b/chrome/test/base/ui_test_utils.h @@ -113,10 +113,6 @@ bool GetCurrentTabTitle(const Browser* browser, string16* title); // race hazard. Use WindowedNotificationObserver instead. void WaitForNewTab(Browser* browser); -// Waits for a |browser_action| to be updated. TODO(gbillock): remove this race -// hazard. Use WindowedNotificationObserver instead. -void WaitForBrowserActionUpdated(ExtensionAction* browser_action); - // Waits for a load stop for the specified |tab|'s controller, if the tab is // currently loading. Otherwise returns immediately. void WaitForLoadStop(content::WebContents* tab); -- cgit v1.1