Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3606)

Unified Diff: chrome/browser/extensions/activity_log/activity_log_browsertest.cc

Issue 23503054: Disable TestScriptInjected browser_test (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/activity_log/activity_log_browsertest.cc
===================================================================
--- chrome/browser/extensions/activity_log/activity_log_browsertest.cc (revision 223302)
+++ chrome/browser/extensions/activity_log/activity_log_browsertest.cc (working copy)
@@ -61,12 +61,15 @@
}
};
-IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) {
-#if defined (USE_AURA)
+#if defined(USE_AURA)
// This tests fails in Aura, but it is the only one in this set so
// we disable it for now. Tracking bug: 292299.
- return;
+#define MAYBE_TestScriptInjected DISABLED_TestScriptInjected
+#else
+#define MAYBE_TestScriptInjected TestScriptInjected
#endif
+
+IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, MAYBE_TestScriptInjected) {
host_resolver()->AddRule("*", "127.0.0.1");
StartEmbeddedTestServer();
int port = embedded_test_server()->port();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698