Re-land alexbost's experimental offscreenTabs API.

chrome/browser/extensions/execute_script_apitest.cc

 // Copyright (c) 2012 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)
-
-IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptBasic) {
+// If failing, disable and update http://crbug.com/92105.
+IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptBasic) {

[asargent_no_longer_on_chrome, 2012/02/29 18:20:52]

These changes look unrelated to offscreen tabs. Cruft from another CL or
something?

[jstritar, 2012/03/12 14:53:06]

Done.

   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) {
+// If failing, disable and update http://crbug.com/92105.
+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)
-
+// If failing, disable and update http://crbug.com/84760.
 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.
+// If crashing, disable and update 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_;
 }
 
 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)
-
+// If failing, disable and update http://crbug.com/92105.
 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
-                       MAYBE_ExecuteScriptFrameAfterLoad) {
+                       ExecuteScriptFrameAfterLoad) {
   SetupDelayedHostResolver();
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("executescript/frame_after_load")) << message_;
 }