| 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();
|
|
|