WebKit roll 59478:59607

TBR=atwilson
BUG=44371,44371

Review URL: http://codereview.chromium.org/2132004

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

2 files changed, 11 insertions, 9 deletions

diff --git a/chrome/test/automation/extension_proxy_uitest.cc b/chrome/test/automation/extension_proxy_uitest.cc
index 0954f5a..a388bbf 100644
--- a/chrome/test/automation/extension_proxy_uitest.cc
+++ b/chrome/test/automation/extension_proxy_uitest.cc
@@ -94,7 +94,8 @@ TEST_F(ExtensionProxyUITest, Uninstall) {
   ASSERT_TRUE(simple_extension_->Uninstall());
 }
 
-TEST_F(ExtensionProxyUITest, ExecuteBrowserActionInActiveTabAsync) {
+// http://crbug.com/44370
+TEST_F(ExtensionProxyUITest, DISABLED_ExecuteBrowserActionInActiveTabAsync) {
   scoped_refptr<BrowserProxy> browser = automation()->GetBrowserWindow(0);
   ASSERT_TRUE(browser.get());
   scoped_refptr<ExtensionProxy> rename_tab_extension =
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index 8f86d70..2f13cb5 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -117,42 +117,43 @@ void NaClTest::TearDown() {
   UITest::TearDown();
 }
 
-TEST_F(NaClTest, ServerTest) {
+// http://crbug.com/44371
+TEST_F(NaClTest, DISABLED_ServerTest) {
   FilePath test_file(kServerHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, SrpcHelloWorld) {
+TEST_F(NaClTest, DISABLED_SrpcHelloWorld) {
   FilePath test_file(kSrpcHwHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, SrpcBasicTest) {
+TEST_F(NaClTest, DISABLED_SrpcBasicTest) {
   FilePath test_file(kSrpcBasicHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, SrpcSockAddrTest) {
+TEST_F(NaClTest, DISABLED_SrpcSockAddrTest) {
   FilePath test_file(kSrpcSockAddrHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, SrpcShmTest) {
+TEST_F(NaClTest, DISABLED_SrpcShmTest) {
   FilePath test_file(kSrpcShmHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, SrpcPluginTest) {
+TEST_F(NaClTest, DISABLED_SrpcPluginTest) {
   FilePath test_file(kSrpcPluginHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, SrpcNrdXferTest) {
+TEST_F(NaClTest, DISABLED_SrpcNrdXferTest) {
   FilePath test_file(kSrpcNrdXferHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }
 
-TEST_F(NaClTest, NpapiHwTest) {
+TEST_F(NaClTest, DISABLED_NpapiHwTest) {
   FilePath test_file(kNpapiHwHtmlFileName);
   RunTest(test_file, action_max_timeout_ms());
 }