Update from https://crrev.com/308996

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 2b78394e3daa9909875656934b05547203cf37ef..516d93479d5aeb6b3fd2ece1ad9c272d2cce8658 100644
--- a/net/base/sdch_manager_unittest.cc
+++ b/net/base/sdch_manager_unittest.cc
@@ -18,6 +18,9 @@
 
 namespace net {
 
+// Workaround for http://crbug.com/437794; remove when fixed.
+#if !defined(OS_IOS)
+
 //------------------------------------------------------------------------------
 // Provide sample data and compression results with a sample VCDIFF dictionary.
 // Note an SDCH dictionary has extra meta-data before the VCDIFF dictionary.
@@ -654,4 +657,26 @@ TEST_F(SdchManagerTest, ExpirationCheckedProperly) {
   EXPECT_EQ(SDCH_OK, problem_code);
 }
 
+TEST_F(SdchManagerTest, SdchOnByDefault) {
+  GURL google_url("http://www.google.com");
+  scoped_ptr<SdchManager> sdch_manager(new SdchManager);
+
+  EXPECT_EQ(SDCH_OK, sdch_manager->IsInSupportedDomain(google_url));
+  SdchManager::EnableSdchSupport(false);
+  EXPECT_EQ(SDCH_DISABLED, sdch_manager->IsInSupportedDomain(google_url));
+}
+
+#else
+
+TEST(SdchManagerTest, SdchOffByDefault) {
+  GURL google_url("http://www.google.com");
+  scoped_ptr<SdchManager> sdch_manager(new SdchManager);
+
+  EXPECT_EQ(SDCH_DISABLED, sdch_manager->IsInSupportedDomain(google_url));
+  SdchManager::EnableSdchSupport(true);
+  EXPECT_EQ(SDCH_OK, sdch_manager->IsInSupportedDomain(google_url));
+}
+
+#endif  // !defined(OS_IOS)
+
 }  // namespace net