Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

net/base/sdch_manager_unittest.cc

Index: net/base/sdch_manager_unittest.cc
diff --git a/net/base/sdch_manager_unittest.cc b/net/base/sdch_manager_unittest.cc
index f6d44bebb8595cdebfb93475044423143f4f3c94..f1b39e771ae50a80d30dbe2d5b7bb449a52d18af 100644
--- a/net/base/sdch_manager_unittest.cc
+++ b/net/base/sdch_manager_unittest.cc
@@ -518,12 +518,21 @@ TEST_F(SdchManagerTest, HttpsCorrectlySupported) {
   GURL url("http://www.google.com");
   GURL secure_url("https://www.google.com");
 
+#if !defined(OS_IOS)
+  // Workaround for http://crbug.com/418975; remove when fixed.
+  bool expect_https_support = true;
+#else
+  bool expect_https_support = false;
+#endif
+
   EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(url));
-  EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(secure_url));
+  EXPECT_EQ(expect_https_support,
+            sdch_manager()->IsInSupportedDomain(secure_url));
 
-  SdchManager::EnableSecureSchemeSupport(false);
+  SdchManager::EnableSecureSchemeSupport(!expect_https_support);
   EXPECT_TRUE(sdch_manager()->IsInSupportedDomain(url));
-  EXPECT_FALSE(sdch_manager()->IsInSupportedDomain(secure_url));
+  EXPECT_NE(expect_https_support,
+            sdch_manager()->IsInSupportedDomain(secure_url));
 }
 
 TEST_F(SdchManagerTest, ClearDictionaryData) {