Update from https://crrev.com/304715

net/http/http_server_properties_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 "net/http/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 223 matching lines @@
       http_server_props_manager_->GetSupportsQuic(
           net::HostPortPair::FromString("www.google.com:80"));
   EXPECT_TRUE(supports_quic2.used_quic);
   EXPECT_EQ("foo", supports_quic2.address);
   supports_quic2 = http_server_props_manager_->GetSupportsQuic(
       net::HostPortPair::FromString("mail.google.com:80"));
   EXPECT_FALSE(supports_quic2.used_quic);
   EXPECT_EQ("bar", supports_quic2.address);
 }
 
+TEST_F(HttpServerPropertiesManagerTest, BadCachedHostPortPair) {
+  ExpectCacheUpdate();
+  // The prefs are automaticalls updated in the case corruption is detected.
+  ExpectPrefsUpdate();
+
+  base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
+
+  // Set supports_spdy for www.google.com:65536.
+  server_pref_dict->SetBoolean("supports_spdy", true);
+
+  // Set up alternate_protocol for www.google.com:65536.
+  base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
+  alternate_protocol->SetInteger("port", 80);
+  alternate_protocol->SetString("protocol_str", "npn-spdy/3");
+  server_pref_dict->SetWithoutPathExpansion("alternate_protocol",
+                                            alternate_protocol);
+
+  // Set up SupportsQuic for www.google.com:65536.
+  base::DictionaryValue* supports_quic = new base::DictionaryValue;
+  supports_quic->SetBoolean("used_quic", true);
+  supports_quic->SetString("address", "foo");
+  server_pref_dict->SetWithoutPathExpansion("supports_quic", supports_quic);
+
+  // Set the server preference for www.google.com:65536.
+  base::DictionaryValue* servers_dict = new base::DictionaryValue;
+  servers_dict->SetWithoutPathExpansion("www.google.com:65536",
+                                        server_pref_dict);
+
+  base::DictionaryValue* http_server_properties_dict =
+      new base::DictionaryValue;
+  HttpServerPropertiesManager::SetVersion(http_server_properties_dict, -1);
+  http_server_properties_dict->SetWithoutPathExpansion("servers", servers_dict);
+
+  // Set up the pref.
+  pref_service_.SetManagedPref(kTestHttpServerProperties,
+                               http_server_properties_dict);
+
+  base::RunLoop().RunUntilIdle();
+  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
+
+  // Verify that nothing is set.
+  EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(
+      net::HostPortPair::FromString("www.google.com:65536")));
+  EXPECT_FALSE(http_server_props_manager_->HasAlternateProtocol(
+      net::HostPortPair::FromString("www.google.com:65536")));
+  net::SupportsQuic supports_quic2 =
+      http_server_props_manager_->GetSupportsQuic(
+          net::HostPortPair::FromString("www.google.com:65536"));
+  EXPECT_FALSE(supports_quic2.used_quic);
+}
+
+TEST_F(HttpServerPropertiesManagerTest, BadCachedAltProtocolPort) {
+  ExpectCacheUpdate();
+  // The prefs are automaticalls updated in the case corruption is detected.
+  ExpectPrefsUpdate();
+
+  base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
+
+  // Set supports_spdy for www.google.com:80.
+  server_pref_dict->SetBoolean("supports_spdy", true);
+
+  // Set up alternate_protocol for www.google.com:80.
+  base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
+  alternate_protocol->SetInteger("port", 65536);
+  alternate_protocol->SetString("protocol_str", "npn-spdy/3");
+  server_pref_dict->SetWithoutPathExpansion("alternate_protocol",
+                                            alternate_protocol);
+
+  // Set the server preference for www.google.com:80.
+  base::DictionaryValue* servers_dict = new base::DictionaryValue;
+  servers_dict->SetWithoutPathExpansion("www.google.com:80", server_pref_dict);
+
+  base::DictionaryValue* http_server_properties_dict =
+      new base::DictionaryValue;
+  HttpServerPropertiesManager::SetVersion(http_server_properties_dict, -1);
+  http_server_properties_dict->SetWithoutPathExpansion("servers", servers_dict);
+
+  // Set up the pref.
+  pref_service_.SetManagedPref(kTestHttpServerProperties,
+                               http_server_properties_dict);
+
+  base::RunLoop().RunUntilIdle();
+  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
+
+  // Verify AlternateProtocol is not set.
+  EXPECT_FALSE(http_server_props_manager_->HasAlternateProtocol(
+      net::HostPortPair::FromString("www.google.com:80")));
+}
+
 TEST_F(HttpServerPropertiesManagerTest, SupportsSpdy) {
   ExpectPrefsUpdate();
 
   // Post an update task to the network thread. SetSupportsSpdy calls
   // ScheduleUpdatePrefsOnNetworkThread.
 
   // Add mail.google.com:443 as a supporting spdy server.
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
@@ skipping 274 matching lines @@
   // Run the task after shutdown, but before deletion.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace
 
 }  // namespace net