Update from https://crrev.com/308996

net/base/sdch_manager_unittest.cc

 // Copyright 2014 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 <limits.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/simple_test_clock.h"
 #include "net/base/net_log.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/sdch_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 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.
 static const char kTestVcdiffDictionary[] = "DictionaryFor"
     "SdchCompression1SdchCompression2SdchCompression3SdchCompression\n";
 
 //------------------------------------------------------------------------------
 
 class MockSdchObserver : public SdchObserver {
  public:
@@ skipping 616 matching lines @@
       clock.Pass());
 
   // Make sure it's not visible for advertisement, but is visible
   // if looked up by hash.
   EXPECT_FALSE(sdch_manager()->GetDictionarySet(target_gurl));
   EXPECT_TRUE(sdch_manager()->GetDictionarySetByHash(
       target_gurl, server_hash, &problem_code));
   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