summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-06 12:48:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:33:43 +0000
commit7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (patch)
treefa14ba0ca8d2683ba2efdabd246dc9b18a1229c6 /chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
parent79b4f909db1049fca459c07cca55af56a9b54fe3 (diff)
BASELINE: Update Chromium to 84.0.4147.141
Change-Id: Ib85eb4cfa1cbe2b2b81e5022c8cad5c493969535 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc')
-rw-r--r--chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index 219390ecbe9..0250208c25f 100644
--- a/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chromium/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
@@ -8,7 +8,6 @@
#include "base/test/test_timeouts.h"
#include "build/build_config.h"
#include "chrome/browser/download/download_prefs.h"
-#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/ui/browser.h"
@@ -29,7 +28,9 @@
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test.h"
#include "content/public/test/download_test_observer.h"
+#include "extensions/browser/extension_action.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/notification_types.h"
#include "extensions/common/extension.h"
@@ -129,12 +130,7 @@ class BrowserActionInteractiveTest : public ExtensionApiTest {
// window to able to be made active automatically. Returns false for platforms
// where these conditions are not met.
bool ShouldRunPopupTest() {
- // TODO(justinlin): http://crbug.com/177163
-#if defined(OS_WIN) && !defined(NDEBUG)
- return false;
-#else
return true;
-#endif
}
void EnsurePopupActive() {
@@ -914,6 +910,7 @@ IN_PROC_BROWSER_TEST_F(NavigatingExtensionPopupInteractiveTest,
GURL other_extension_url = other_extension().GetResourceURL("other.html");
TestPopupNavigationViaGet(other_extension_url, EXPECTING_NAVIGATION_FAILURE);
}
+
IN_PROC_BROWSER_TEST_F(NavigatingExtensionPopupInteractiveTest,
PageInOtherExtension_Post) {
GURL other_extension_url = other_extension().GetResourceURL("other.html");