Disable TestScriptInjected browser_test

The previous approach did not work, not sure why. Here we take the more
standard approach.

It fails with Aura enabled, but it is the only one to do so and only on XP.

BUG=292299
TBR=mpcomplete

Review URL: https://codereview.chromium.org/23503054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223313 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/activity_log/activity_log_browsertest.cc

@@ -61,12 +61,15 @@ class ActivityLogPrerenderTest : public ExtensionApiTest {
   }
 };
 
-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();