Roll WebKit 100977:101017

chrome/browser/debugger/devtools_sanity_unittest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
@@ skipping 523 matching lines @@
           L"window.domAutomationController.send("
           L"'' + (window.uiTests && (typeof uiTests.runTest)));",
           &result));
   ASSERT_EQ("function", result) << "DevTools front-end is broken.";
   CloseDevToolsWindow();
 }
 
 #if defined(OS_MACOSX)
 #define MAYBE_InspectSharedWorker DISABLED_InspectSharedWorker
 #else
-#define MAYBE_InspectSharedWorker InspectSharedWorker
+#define MAYBE_InspectSharedWorker FAILS_InspectSharedWorker
 #endif
 // Flakily fails with 25s timeout: http://crbug.com/89845
 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest, MAYBE_InspectSharedWorker) {
   RunTest("testSharedWorker", kSharedWorkerTestPage);
 }
 
 // http://crbug.com/100538
 #if defined(OS_MACOSX)
 #define MAYBE_PauseInSharedWorkerInitialization DISABLED_PauseInSharedWorkerInitialization
-#elif defined(OS_WIN)
-#define MAYBE_PauseInSharedWorkerInitialization FLAKY_PauseInSharedWorkerInitialization
 #else
-#define MAYBE_PauseInSharedWorkerInitialization PauseInSharedWorkerInitialization
+#define MAYBE_PauseInSharedWorkerInitialization FAILS_PauseInSharedWorkerInitialization
 #endif
 // See http://crbug.com/100538
 IN_PROC_BROWSER_TEST_F(WorkerDevToolsSanityTest,
                        MAYBE_PauseInSharedWorkerInitialization) {
     ASSERT_TRUE(test_server()->Start());
     GURL url = test_server()->GetURL(kReloadSharedWorkerTestPage);
     ui_test_utils::NavigateToURL(browser(), url);
 
     scoped_refptr<WorkerData> worker_data = WaitForFirstSharedWorker();
     OpenDevToolsWindowForSharedWorker(worker_data.get());
 
     TerminateWorker(worker_data);
 
     // Reload page to restart the worker.
     ui_test_utils::NavigateToURL(browser(), url);
 
     // Wait until worker script is paused on the debugger statement.
     RunTestFuntion(window_, "testPauseInSharedWorkerInitialization");
     CloseDevToolsWindow();
 }
 
 }  // namespace