summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/extensions/browser_action_test_util.h7
-rw-r--r--chrome/browser/ui/views/browser_action_test_util_views.cc15
-rw-r--r--chrome/browser/ui/views/browser_actions_container_browsertest.cc10
-rw-r--r--chrome/chrome_tests.gypi18
-rw-r--r--chrome/test/base/ui_test_utils.cc7
-rw-r--r--chrome/test/base/ui_test_utils.h4
6 files changed, 16 insertions, 45 deletions
diff --git a/chrome/browser/extensions/browser_action_test_util.h b/chrome/browser/extensions/browser_action_test_util.h
index 667f080..33960fb 100644
--- a/chrome/browser/extensions/browser_action_test_util.h
+++ b/chrome/browser/extensions/browser_action_test_util.h
@@ -11,6 +11,7 @@
#include "build/build_config.h"
class Browser;
+class ExtensionAction;
namespace gfx {
class Rect;
@@ -27,9 +28,9 @@ class BrowserActionTestUtil {
// 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
diff --git a/chrome/browser/ui/views/browser_action_test_util_views.cc b/chrome/browser/ui/views/browser_action_test_util_views.cc
index 8797af0..9c0d256 100644
--- a/chrome/browser/ui/views/browser_action_test_util_views.cc
+++ b/chrome/browser/ui/views/browser_action_test_util_views.cc
@@ -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 @@ 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()->
diff --git a/chrome/browser/ui/views/browser_actions_container_browsertest.cc b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
index 3294ad4..03ac06c 100644
--- a/chrome/browser/ui/views/browser_actions_container_browsertest.cc
+++ b/chrome/browser/ui/views/browser_actions_container_browsertest.cc
@@ -8,8 +8,10 @@
#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;
@@ -32,7 +34,13 @@ class BrowserActionsContainerTest : public ExtensionBrowserTest {
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));
}
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 646dc57..9fb939e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2737,9 +2737,6 @@
'browser/extensions/autoupdate_interceptor.h',
'browser/extensions/background_page_apitest.cc',
'browser/extensions/background_scripts_apitest.cc',
- 'browser/extensions/browser_action_test_util.h',
- 'browser/extensions/browser_action_test_util_gtk.cc',
- 'browser/extensions/browser_action_test_util_mac.mm',
'browser/extensions/chrome_app_api_browsertest.cc',
'browser/extensions/content_script_apitest.cc',
'browser/extensions/content_security_policy_apitest.cc',
@@ -2916,7 +2913,6 @@
'browser/ui/views/ash/launcher/chrome_launcher_controller_browsertest.cc',
'browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc',
'browser/ui/views/ash/volume_controller_browsertest_chromeos.cc',
- 'browser/ui/views/browser_action_test_util_views.cc',
'browser/ui/views/browser_actions_container_browsertest.cc',
'browser/ui/views/constrained_window_views_browsertest.cc',
'browser/ui/views/frame/app_non_client_frame_view_aura_browsertest.cc',
@@ -3184,7 +3180,6 @@
}],
['OS!="linux" or toolkit_views==1', {
'sources!': [
- 'browser/extensions/browser_action_test_util_gtk.cc',
'browser/ui/gtk/view_id_util_browsertest.cc',
],
}],
@@ -3302,10 +3297,6 @@
# ProcessSingletonMac doesn't do anything.
'browser/process_singleton_browsertest.cc',
],
- }, { # else: OS != "mac"
- 'sources!': [
- 'browser/extensions/browser_action_test_util_mac.mm',
- ],
}],
['os_posix == 0 or chromeos == 1', {
'sources!': [
@@ -3483,11 +3474,6 @@
},
],
'conditions': [
- ['OS!="linux" or toolkit_views==1', {
- 'sources!': [
- 'browser/extensions/browser_action_test_util_gtk.cc',
- ],
- }],
['OS=="win"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
@@ -3565,10 +3551,6 @@
'dependencies': [
'chrome'
],
- }, { # else: OS != "mac"
- 'sources!': [
- 'browser/extensions/browser_action_test_util_mac.mm',
- ],
}],
['os_posix == 1 and OS != "mac"', {
'conditions': [
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<ExtensionAction>(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);
generated by cgit v1.1 at 2025-02-16 08:06:29 +0000