Re-land alexbost's experimental offscreenTabs API.

chrome/browser/extensions/execute_script_apitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "net/base/mock_host_resolver.h"
 
 class ExecuteScriptApiTest : public ExtensionApiTest {
  protected:
   void SetupDelayedHostResolver() {
     // We need a.com to be a little bit slow to trigger a race condition.
     host_resolver()->AddRuleWithLatency("a.com", "127.0.0.1", 500);
     host_resolver()->AddRule("b.com", "127.0.0.1");
     host_resolver()->AddRule("c.com", "127.0.0.1");
   }
 };
 
-// DISABLED http://crbug.com/92105
-#if defined(OS_CHROMEOS)
-#define MAYBE_ExecuteScriptBasic DISABLED_ExecuteScriptBasic
-#else
-#define MAYBE_ExecuteScriptBasic ExecuteScriptBasic
-#endif  // defined(OS_CHROMEOS)

[jstritar, 2012/01/26 19:55:25]

I re-enabled all these to see if they're still failing...

-
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptBasic) {
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptBasic) {
   SetupDelayedHostResolver();
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_;
 }
 
-// DISABLED http://crbug.com/92105
-#if defined(OS_CHROMEOS)
-#define MAYBE_ExecuteScriptInFrame DISABLED_ExecuteScriptInFrame
-#else
-#define MAYBE_ExecuteScriptInFrame ExecuteScriptInFrame
-#endif  // defined(OS_CHROMEOS)
-
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptInFrame) {
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptInFrame) {
   SetupDelayedHostResolver();
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptPermissions) {
   SetupDelayedHostResolver();
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("executescript/permissions")) << message_;
 }
 
-// http://crbug.com/84760
-#if defined(OS_CHROMEOS)
-#define MAYBE_ExecuteScriptFileAfterClose DISABLED_ExecuteScriptFileAfterClose
-#else
-#define MAYBE_ExecuteScriptFileAfterClose ExecuteScriptFileAfterClose
-#endif  // defined(OS_CHROMEOS)
-
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
-                       MAYBE_ExecuteScriptFileAfterClose) {
+                       ExecuteScriptFileAfterClose) {
   host_resolver()->AddRule("b.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_;
 }
 
-// Crashy, http://crbug.com/67774.
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
-                       DISABLED_ExecuteScriptFragmentNavigation) {
+                       ExecuteScriptFragmentNavigation) {
   ASSERT_TRUE(StartTestServer());
   const char* extension_name = "executescript/fragment";
   ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceExecuteScript) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   host_resolver()->AddRule("b.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
                                   "execute_script.html")) << message_;
 }
 
-
-#if defined(OS_LINUX)
-// Fails on Linux.  http://crbug.com/89731
-#define MAYBE_NavigationRaceJavaScriptUrl DISABLED_NavigationRaceJavaScriptUrl
-#else
-#define MAYBE_NavigationRaceJavaScriptUrl NavigationRaceJavaScriptUrl
-#endif

[jstritar, 2012/01/26 19:55:25]

This CL fixes issue 89731.

[Mihai Parparita -not on Chrome, 2012/01/26 20:21:02]

Any chance this fix could be moved to a separate CL?

[Ken Russell (switch to Gerrit), 2012/01/27 01:27:50]

Agree it would be nicer if that could be split off. Also, I don't see where in
this CL that other bug is actually fixed. Could this be why the new
OffscreenTabs API tests are still failing in the most recent Mac and Linux try
jobs?

[jstritar, 2012/01/27 22:01:19]

I created a new CL for the fix, http://codereview.chromium.org/9225010/. I'll
need to merge that into this CL once it lands.

-
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
-                       MAYBE_NavigationRaceJavaScriptUrl) {
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, NavigationRaceJavaScriptUrl) {
   host_resolver()->AddRule("a.com", "127.0.0.1");
   host_resolver()->AddRule("b.com", "127.0.0.1");
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionSubtest("executescript/navigation_race",
                                   "javascript_url.html")) << message_;
 }
 
-// DISABLED http://crbug.com/92105
-#if defined(OS_CHROMEOS)
-#define MAYBE_ExecuteScriptFrameAfterLoad DISABLED_ExecuteScriptFrameAfterLoad
-#else
-#define MAYBE_ExecuteScriptFrameAfterLoad ExecuteScriptFrameAfterLoad
-#endif  // defined(OS_CHROMEOS)
-
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
-                       MAYBE_ExecuteScriptFrameAfterLoad) {
+                       ExecuteScriptFrameAfterLoad) {
   SetupDelayedHostResolver();
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_;
 }