[predictor] Apply HSTS redirects when learning referrers.

chrome/browser/net/predictor_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/net/predictor.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 533 matching lines @@
   predictor.DeserializeReferrers(*referral_list.get());
 
   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, 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);
 
   Predictor testing_master(true, true);
 
   GURL goog("http://www.google.com:80");
   testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED);
   EXPECT_FALSE(testing_master.work_queue_.IsEmpty());
 
@@ skipping 55 matching lines @@
   testing_master.Resolve(goog, UrlInfo::OMNIBOX_MOTIVATED);
 
   // Proxy may not be in use (the PAC script has not yet been evaluated), so the
   // name has been registered for pre-resolve.
   EXPECT_FALSE(testing_master.work_queue_.IsEmpty());
 
   testing_master.Shutdown();
 }
 
 }  // namespace chrome_browser_net