Roll webkit 52633 -> 52667.

chrome/browser/extensions/extension_browsertests_misc.cc

 // Copyright (c) 2009 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/ref_counted.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 465 matching lines @@
   HTTPTestServer* server = StartHTTPServer();
   // Try a feed that doesn't exist.
   GetParsedFeedData(server, L"foo.xml", browser(),
                     "Feed for 'Unknown feed name'",
                     "element 'anchor_0' not found",
                     "element 'desc_0' not found",
                     "Not a valid feed.");
 }
 
 // Tests that message passing between extensions and tabs works.
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingExtensionTab) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_MessagingExtensionTab) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
                     .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
                     .AppendASCII("1.0")));
 
   // Get the ExtensionHost that is hosting our toolstrip page.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
   ExtensionHost* host = FindHostWithPath(manager, "/toolstrip.html", 1);
 
@@ skipping 38 matching lines @@
       browser()->profile()->GetExtensionProcessManager();
   ExtensionHost* host = FindHostWithPath(manager, "/toolstrip.html", 1);
 
   bool result = false;
   ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testLastError()", &result);
   EXPECT_TRUE(result);
 }
 
 // Tests that message passing between extensions and content scripts works.
-IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MessagingContentScript) {
+IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_MessagingContentScript) {
   HTTPTestServer* server = StartHTTPServer();
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
                     .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
                     .AppendASCII("1.0")));
 
   UserScriptMaster* master = browser()->profile()->GetUserScriptMaster();
   if (!master->ScriptsReady()) {
     // Wait for UserScriptMaster to finish its scan.
@@ skipping 342 matching lines @@
 
   // If the options page hasn't already come up, wait for it.
   if (tab_strip->count() == 1) {
     ui_test_utils::WaitForNewTab(browser());
   }
   ASSERT_EQ(2, tab_strip->count());
 
   EXPECT_EQ(extension->GetResourceURL("options.html"),
             tab_strip->GetTabContentsAt(1)->GetURL());
 }