[predictor] Apply HSTS redirects when learning referrers.

chrome/browser/net/predictor_unittest.cc

Index: chrome/browser/net/predictor_unittest.cc
diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc
index c975a6486938945faf0ec2ed5d06cd1ebe717050..38eeefc293d76db7642d2de33797f2a373688184 100644
--- a/chrome/browser/net/predictor_unittest.cc
+++ b/chrome/browser/net/predictor_unittest.cc
@@ -551,6 +551,31 @@ TEST_F(PredictorTest, HSTSRedirectSubresources) {
   predictor.Shutdown();
 }
 
+TEST_F(PredictorTest, HSTSRedirectLearnedSubresource) {
+  const GURL kHttpUrl("http://example.com");
+  const GURL kHttpsUrl("https://example.com");
+  const GURL kSubresourceUrl("https://images.example.com");
+
+  const base::Time expiry =
+      base::Time::Now() + base::TimeDelta::FromSeconds(1000);
+  net::TransportSecurityState state;
+  state.AddHSTS(kHttpUrl.host(), expiry, false);
+
+  SimplePredictor predictor(true, true);
+  TestPredictorObserver observer;
+  predictor.SetObserver(&observer);
+  predictor.SetTransportSecurityState(&state);
+
+  predictor.LearnFromNavigation(kHttpUrl, kSubresourceUrl);

[mmenke, 2016/06/01 18:19:44]

We'd also call predictor.LearnFromNavigation(kHttpUrl, kHttpsUrl); before this,
for the HSTS redirect, right?

[Charlie Harrison, 2016/06/01 19:50:34]

Yeah we'd learn it. Do you think that fits in the unit test? I'm not sure if
that makes the test easier to understand or harder.

+
+  predictor.PreconnectUrlAndSubresources(kHttpUrl, GURL());
+  ASSERT_EQ(2u, observer.preconnected_urls_.size());
+  EXPECT_EQ(kHttpsUrl, observer.preconnected_urls_[0]);
+  EXPECT_EQ(kSubresourceUrl, observer.preconnected_urls_[1]);
+
+  predictor.Shutdown();
+}
+
 TEST_F(PredictorTest, NoProxyService) {
   // Don't actually try to resolve names.
   Predictor::set_max_parallel_resolves(0);