Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 48 insertions, 6 deletions

diff --git a/chrome/browser/login_prompt_uitest.cc b/chrome/browser/login_prompt_uitest.cc
index 410db2b..bdda3fd 100644
--- a/chrome/browser/login_prompt_uitest.cc
+++ b/chrome/browser/login_prompt_uitest.cc
@@ -51,8 +51,15 @@ wstring ExpectedTitleFromAuth(const wstring& username,
   return username + L"/" + password;
 }
 
+#if defined(OS_WIN)
+// Probably related to test server flakiness in http://crbug.com/60937
+#define MAYBE_TestBasicAuth FLAKY_TestBasicAuth
+#else
+#define MAYBE_TestBasicAuth TestBasicAuth
+#endif
+
 // Test that "Basic" HTTP authentication works.
-TEST_F(LoginPromptTest, TestBasicAuth) {
+TEST_F(LoginPromptTest, MAYBE_TestBasicAuth) {
   ASSERT_TRUE(test_server_.Start());
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -75,8 +82,15 @@ TEST_F(LoginPromptTest, TestBasicAuth) {
             GetActiveTabTitle());
 }
 
+#if defined(OS_WIN)
+// Probably related to test server flakiness in http://crbug.com/60937
+#define MAYBE_TestDigestAuth FLAKY_TestDigestAuth
+#else
+#define MAYBE_TestDigestAuth TestDigestAuth
+#endif
+
 // Test that "Digest" HTTP authentication works.
-TEST_F(LoginPromptTest, TestDigestAuth) {
+TEST_F(LoginPromptTest, MAYBE_TestDigestAuth) {
   ASSERT_TRUE(test_server_.Start());
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -98,8 +112,15 @@ TEST_F(LoginPromptTest, TestDigestAuth) {
             GetActiveTabTitle());
 }
 
+#if defined(OS_WIN)
+// Probably related to test server flakiness in http://crbug.com/60937
+#define MAYBE_TestTwoAuths FLAKY_TestTwoAuths
+#else
+#define MAYBE_TestTwoAuths TestTwoAuths
+#endif
+
 // Test that logging in on 2 tabs at once works.
-TEST_F(LoginPromptTest, TestTwoAuths) {
+TEST_F(LoginPromptTest, MAYBE_TestTwoAuths) {
   ASSERT_TRUE(test_server_.Start());
 
   scoped_refptr<TabProxy> basic_tab(GetActiveTab());
@@ -126,8 +147,15 @@ TEST_F(LoginPromptTest, TestTwoAuths) {
   EXPECT_EQ(ExpectedTitleFromAuth(username_digest_, password_), title);
 }
 
+#if defined(OS_WIN)
+// Probably related to test server flakiness in http://crbug.com/60937
+#define MAYBE_TestCancelAuth FLAKY_TestCancelAuth
+#else
+#define MAYBE_TestCancelAuth TestCancelAuth
+#endif
+
 // Test that cancelling authentication works.
-TEST_F(LoginPromptTest, TestCancelAuth) {
+TEST_F(LoginPromptTest, MAYBE_TestCancelAuth) {
   ASSERT_TRUE(test_server_.Start());
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -171,9 +199,16 @@ TEST_F(LoginPromptTest, TestCancelAuth) {
   EXPECT_EQ(L"Denied: no auth", GetActiveTabTitle());
 }
 
+#if defined(OS_WIN)
+// Probably related to test server flakiness in http://crbug.com/60937
+#define MAYBE_SupplyRedundantAuths FLAKY_SupplyRedundantAuths
+#else
+#define MAYBE_SupplyRedundantAuths SupplyRedundantAuths
+#endif
+
 // If multiple tabs are looking for the same auth, the user should only have to
 // enter it once.
-TEST_F(LoginPromptTest, SupplyRedundantAuths) {
+TEST_F(LoginPromptTest, MAYBE_SupplyRedundantAuths) {
   ASSERT_TRUE(test_server_.Start());
 
   scoped_refptr<TabProxy> basic_tab1(GetActiveTab());
@@ -204,9 +239,16 @@ TEST_F(LoginPromptTest, SupplyRedundantAuths) {
   EXPECT_EQ(ExpectedTitleFromAuth(username_basic_, password_), title2);
 }
 
+#if defined(OS_WIN)
+// Probably related to test server flakiness in http://crbug.com/60937
+#define MAYBE_CancelRedundantAuths FLAKY_CancelRedundantAuths
+#else
+#define MAYBE_CancelRedundantAuths CancelRedundantAuths
+#endif
+
 // If multiple tabs are looking for the same auth, and one is cancelled, the
 // other should be cancelled as well.
-TEST_F(LoginPromptTest, CancelRedundantAuths) {
+TEST_F(LoginPromptTest, MAYBE_CancelRedundantAuths) {
   ASSERT_TRUE(test_server_.Start());
 
   scoped_refptr<TabProxy> basic_tab1(GetActiveTab());