predictors: Make speculative_prefetch_predictor work with PlzNavigate

chrome/browser/predictors/resource_prefetch_predictor_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 "chrome/browser/predictors/resource_prefetch_predictor.h"
 
 #include <iostream>
 #include <memory>
 #include <utility>
 
@@ skipping 171 matching lines @@
             base::string16(),
             visit_count,
             0,
             base::Time::Now(),
             false,
             history::SOURCE_BROWSED);
     profile_->BlockUntilHistoryProcessesPendingRequests();
   }
 
   URLRequestSummary CreateRedirectRequestSummary(
-      int process_id,
-      int render_frame_id,
+      int tab_id,

[Benoit L, 2016/12/20 09:53:39]

As above, please fix the type and the variable name.

[ahemery, 2016/12/20 13:00:00]

Done

       const std::string& main_frame_url,
       const std::string& redirect_url) {
-    URLRequestSummary summary =
-        CreateURLRequestSummary(process_id, render_frame_id, main_frame_url);
+    URLRequestSummary summary = CreateURLRequestSummary(tab_id, main_frame_url);
     summary.redirect_url = GURL(redirect_url);
     return summary;
   }
 
   std::unique_ptr<net::URLRequest> CreateURLRequest(
       const GURL& url,
       net::RequestPriority priority,
       content::ResourceType resource_type,
-      int render_process_id,
-      int render_frame_id,
       bool is_main_frame) {
     std::unique_ptr<net::URLRequest> request =
         url_request_context_.CreateRequest(url, priority,
                                            &url_request_delegate_);
     request->set_first_party_for_cookies(url);
     content::ResourceRequestInfo::AllocateForTesting(
-        request.get(), resource_type, nullptr, render_process_id, -1,
-        render_frame_id, is_main_frame, false, false, true, false);
+        request.get(), resource_type, nullptr, -1, -1, -1, is_main_frame, false,
+        false, true, false);
     request->Start();
     return request;
   }
 
   void InitializePredictor() {
     predictor_->StartInitialization();
     base::RunLoop loop;
     loop.RunUntilIdle();  // Runs the DB lookup.
     profile_->BlockUntilHistoryProcessesPendingRequests();
   }
@@ skipping 242 matching lines @@
   EXPECT_EQ(test_url_redirect_data_, *predictor_->url_redirect_table_cache_);
   EXPECT_EQ(test_host_redirect_data_, *predictor_->host_redirect_table_cache_);
 }
 
 // Single navigation but history count is low, so should not record.
 TEST_F(ResourcePrefetchPredictorTest, NavigationNotRecorded) {
   const int kVisitCount = 1;
   AddUrlToHistory("https://www.google.com", kVisitCount);
 
   URLRequestSummary main_frame =
-      CreateURLRequestSummary(1, 1, "http://www.google.com");
+      CreateURLRequestSummary(1, "http://www.google.com");
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary main_frame_redirect = CreateRedirectRequestSummary(
-      1, 1, "http://www.google.com", "https://www.google.com");
+      1, "http://www.google.com", "https://www.google.com");
   predictor_->RecordURLRedirect(main_frame_redirect);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
-  main_frame = CreateURLRequestSummary(1, 1, "https://www.google.com");
+  main_frame = CreateURLRequestSummary(1, "https://www.google.com");
 
   // Now add a few subresources.
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "https://www.google.com", "https://google.com/style1.css",
+      1, "https://www.google.com", "https://google.com/style1.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "https://www.google.com", "https://google.com/script1.js",
+      1, "https://www.google.com", "https://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource2);
   URLRequestSummary resource3 = CreateURLRequestSummary(
-      1, 1, "https://www.google.com", "https://google.com/script2.js",
+      1, "https://www.google.com", "https://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource3);
 
   StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
       predictor_.get());
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount,
                           CreatePageRequestSummary(
                               "https://www.google.com", "http://www.google.com",
@@ skipping 18 matching lines @@
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 // Single navigation that will be recorded. Will check for duplicate
 // resources and also for number of resources saved.
 TEST_F(ResourcePrefetchPredictorTest, NavigationUrlNotInDB) {
   const int kVisitCount = 4;
   AddUrlToHistory("http://www.google.com", kVisitCount);
 
   URLRequestSummary main_frame =
-      CreateURLRequestSummary(1, 1, "http://www.google.com");
+      CreateURLRequestSummary(1, "http://www.google.com");
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   std::vector<URLRequestSummary> resources;
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      1, "http://www.google.com", "http://google.com/style1.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      1, "http://www.google.com", "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script2.js",
+      1, "http://www.google.com", "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      1, "http://www.google.com", "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", true));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/image1.png",
+      1, "http://www.google.com", "http://google.com/image1.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/image2.png",
+      1, "http://www.google.com", "http://google.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/style2.css",
+      1, "http://www.google.com", "http://google.com/style2.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true));
   predictor_->RecordURLResponse(resources.back());
 
   StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
       predictor_.get());
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary("http://www.google.com",
                                                         "http://www.google.com",
                                                         resources)));
@@ skipping 39 matching lines @@
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(RedirectDataMap()))))
       .WillOnce(DoAll(SetArgPointee<0>(test_url_data_),
                       SetArgPointee<1>(test_host_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3U, predictor_->url_table_cache_->size());
   EXPECT_EQ(2U, predictor_->host_table_cache_->size());
 
   URLRequestSummary main_frame = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
+      1, "http://www.google.com", "http://www.google.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   std::vector<URLRequestSummary> resources;
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      1, "http://www.google.com", "http://google.com/style1.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      1, "http://www.google.com", "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script2.js",
+      1, "http://www.google.com", "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      1, "http://www.google.com", "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", true));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/image1.png",
+      1, "http://www.google.com", "http://google.com/image1.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/image2.png",
+      1, "http://www.google.com", "http://google.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false));
   predictor_->RecordURLResponse(resources.back());
   resources.push_back(CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/style2.css",
+      1, "http://www.google.com", "http://google.com/style2.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true));
   predictor_->RecordURLResponse(resources.back());
 
   StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
       predictor_.get());
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary("http://www.google.com",
                                                         "http://www.google.com",
                                                         resources)));
@@ skipping 53 matching lines @@
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(RedirectDataMap()))))
       .WillOnce(DoAll(SetArgPointee<0>(test_url_data_),
                       SetArgPointee<1>(test_host_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3U, predictor_->url_table_cache_->size());
   EXPECT_EQ(2U, predictor_->host_table_cache_->size());
 
   URLRequestSummary main_frame = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com", "http://www.nike.com",
+      1, "http://www.nike.com", "http://www.nike.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com", "http://nike.com/style1.css",
+      1, "http://www.nike.com", "http://nike.com/style1.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com", "http://nike.com/image2.png",
+      1, "http://www.nike.com", "http://nike.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource2);
 
   StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
       predictor_.get());
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary(
                                    "http://www.nike.com", "http://www.nike.com",
                                    {resource1, resource2})));
@@ skipping 23 matching lines @@
                          empty_redirect_data_));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, RedirectUrlNotInDB) {
   const int kVisitCount = 4;
   AddUrlToHistory("https://facebook.com/google", kVisitCount);
 
-  URLRequestSummary fb1 = CreateURLRequestSummary(1, 1, "http://fb.com/google");
+  URLRequestSummary fb1 = CreateURLRequestSummary(1, "http://fb.com/google");
   predictor_->RecordURLRequest(fb1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary fb2 = CreateRedirectRequestSummary(
-      1, 1, "http://fb.com/google", "http://facebook.com/google");
+      1, "http://fb.com/google", "http://facebook.com/google");
   predictor_->RecordURLRedirect(fb2);
   URLRequestSummary fb3 = CreateRedirectRequestSummary(
-      1, 1, "http://facebook.com/google", "https://facebook.com/google");
+      1, "http://facebook.com/google", "https://facebook.com/google");
   predictor_->RecordURLRedirect(fb3);
-  NavigationID fb_end = CreateNavigationID(1, 1, "https://facebook.com/google");
+  NavigationID fb_end = CreateNavigationID(1, "https://facebook.com/google");
 
   StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
       predictor_.get());
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount, CreatePageRequestSummary(
                                            "https://facebook.com/google",
                                            "http://fb.com/google",
                                            std::vector<URLRequestSummary>())));
 
@@ skipping 34 matching lines @@
                          Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(RedirectDataMap()))))
       .WillOnce(DoAll(SetArgPointee<2>(test_url_redirect_data_),
                       SetArgPointee<3>(test_host_redirect_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3U, predictor_->url_redirect_table_cache_->size());
   EXPECT_EQ(2U, predictor_->host_redirect_table_cache_->size());
 
-  URLRequestSummary fb1 = CreateURLRequestSummary(1, 1, "http://fb.com/google");
+  URLRequestSummary fb1 = CreateURLRequestSummary(1, "http://fb.com/google");
   predictor_->RecordURLRequest(fb1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary fb2 = CreateRedirectRequestSummary(
-      1, 1, "http://fb.com/google", "http://facebook.com/google");
+      1, "http://fb.com/google", "http://facebook.com/google");
   predictor_->RecordURLRedirect(fb2);
   URLRequestSummary fb3 = CreateRedirectRequestSummary(
-      1, 1, "http://facebook.com/google", "https://facebook.com/google");
+      1, "http://facebook.com/google", "https://facebook.com/google");
   predictor_->RecordURLRedirect(fb3);
-  NavigationID fb_end = CreateNavigationID(1, 1, "https://facebook.com/google");
+  NavigationID fb_end = CreateNavigationID(1, "https://facebook.com/google");
 
   StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
       predictor_.get());
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount, CreatePageRequestSummary(
                                            "https://facebook.com/google",
                                            "http://fb.com/google",
                                            std::vector<URLRequestSummary>())));
 
@@ skipping 103 matching lines @@
 
   predictor_->DeleteAllUrls();
   EXPECT_TRUE(predictor_->url_table_cache_->empty());
   EXPECT_TRUE(predictor_->host_table_cache_->empty());
   EXPECT_TRUE(predictor_->url_redirect_table_cache_->empty());
   EXPECT_TRUE(predictor_->host_redirect_table_cache_->empty());
 }
 
 TEST_F(ResourcePrefetchPredictorTest, OnMainFrameRequest) {
   URLRequestSummary summary1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
+      1, "http://www.google.com", "http://www.google.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   URLRequestSummary summary2 = CreateURLRequestSummary(
-      1, 2, "http://www.google.com", "http://www.google.com",
+      2, "http://www.google.com", "http://www.google.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   URLRequestSummary summary3 = CreateURLRequestSummary(
-      2, 1, "http://www.yahoo.com", "http://www.yahoo.com",
+      3, "http://www.yahoo.com", "http://www.yahoo.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
 
   predictor_->OnMainFrameRequest(summary1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRequest(summary2);
   EXPECT_EQ(2U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRequest(summary3);
   EXPECT_EQ(3U, predictor_->inflight_navigations_.size());
 
   // Insert another with same navigation id. It should replace.
   URLRequestSummary summary4 = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com", "http://www.nike.com",
+      1, "http://www.nike.com", "http://www.nike.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   URLRequestSummary summary5 = CreateURLRequestSummary(
-      1, 2, "http://www.google.com", "http://www.google.com",
+      2, "http://www.google.com", "http://www.google.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
 
   predictor_->OnMainFrameRequest(summary4);
   EXPECT_EQ(3U, predictor_->inflight_navigations_.size());
 
   // Change this creation time so that it will go away on the next insert.
   summary5.navigation_id.creation_time = base::TimeTicks::Now() -
       base::TimeDelta::FromDays(1);
   predictor_->OnMainFrameRequest(summary5);
   EXPECT_EQ(3U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary summary6 = CreateURLRequestSummary(
-      3, 1, "http://www.shoes.com", "http://www.shoes.com",
+      4, "http://www.shoes.com", "http://www.shoes.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->OnMainFrameRequest(summary6);
   EXPECT_EQ(3U, predictor_->inflight_navigations_.size());
 
   EXPECT_TRUE(predictor_->inflight_navigations_.find(summary3.navigation_id) !=
               predictor_->inflight_navigations_.end());
   EXPECT_TRUE(predictor_->inflight_navigations_.find(summary4.navigation_id) !=
               predictor_->inflight_navigations_.end());
   EXPECT_TRUE(predictor_->inflight_navigations_.find(summary6.navigation_id) !=
               predictor_->inflight_navigations_.end());
 }
 
 TEST_F(ResourcePrefetchPredictorTest, OnMainFrameRedirect) {
-  URLRequestSummary yahoo = CreateURLRequestSummary(1, 1, "http://yahoo.com");
+  URLRequestSummary yahoo = CreateURLRequestSummary(1, "http://yahoo.com");
 
-  URLRequestSummary bbc1 = CreateURLRequestSummary(2, 2, "http://bbc.com");
-  URLRequestSummary bbc2 = CreateRedirectRequestSummary(2, 2, "http://bbc.com",
-                                                        "https://www.bbc.com");
-  NavigationID bbc_end = CreateNavigationID(2, 2, "https://www.bbc.com");
+  URLRequestSummary bbc1 = CreateURLRequestSummary(2, "http://bbc.com");
+  URLRequestSummary bbc2 =
+      CreateRedirectRequestSummary(2, "http://bbc.com", "https://www.bbc.com");
+  NavigationID bbc_end = CreateNavigationID(2, "https://www.bbc.com");
 
-  URLRequestSummary youtube1 =
-      CreateURLRequestSummary(1, 2, "http://youtube.com");
+  URLRequestSummary youtube1 = CreateURLRequestSummary(3, "http://youtube.com");
   URLRequestSummary youtube2 = CreateRedirectRequestSummary(
-      1, 2, "http://youtube.com", "https://youtube.com");
-  NavigationID youtube_end = CreateNavigationID(1, 2, "https://youtube.com");
+      3, "http://youtube.com", "https://youtube.com");
+  NavigationID youtube_end = CreateNavigationID(3, "https://youtube.com");
 
-  URLRequestSummary nyt1 = CreateURLRequestSummary(2, 1, "http://nyt.com");
-  URLRequestSummary nyt2 = CreateRedirectRequestSummary(2, 1, "http://nyt.com",
-                                                        "http://nytimes.com");
-  URLRequestSummary nyt3 = CreateRedirectRequestSummary(
-      2, 1, "http://nytimes.com", "http://m.nytimes.com");
-  NavigationID nyt_end = CreateNavigationID(2, 1, "http://m.nytimes.com");
+  URLRequestSummary nyt1 = CreateURLRequestSummary(4, "http://nyt.com");
+  URLRequestSummary nyt2 =
+      CreateRedirectRequestSummary(4, "http://nyt.com", "http://nytimes.com");
+  URLRequestSummary nyt3 = CreateRedirectRequestSummary(4, "http://nytimes.com",
+                                                        "http://m.nytimes.com");
+  NavigationID nyt_end = CreateNavigationID(4, "http://m.nytimes.com");
 
-  URLRequestSummary fb1 = CreateURLRequestSummary(1, 3, "http://fb.com");
-  URLRequestSummary fb2 = CreateRedirectRequestSummary(1, 3, "http://fb.com",
-                                                       "http://facebook.com");
-  URLRequestSummary fb3 = CreateRedirectRequestSummary(
-      1, 3, "http://facebook.com", "https://facebook.com");
+  URLRequestSummary fb1 = CreateURLRequestSummary(5, "http://fb.com");
+  URLRequestSummary fb2 =
+      CreateRedirectRequestSummary(5, "http://fb.com", "http://facebook.com");
+  URLRequestSummary fb3 = CreateRedirectRequestSummary(5, "http://facebook.com",
+                                                       "https://facebook.com");
   URLRequestSummary fb4 = CreateRedirectRequestSummary(
-      1, 3, "https://facebook.com",
+      5, "https://facebook.com",
       "https://m.facebook.com/?refsrc=https%3A%2F%2Fwww.facebook.com%2F&_rdr");
   NavigationID fb_end = CreateNavigationID(
-      1, 3,
+      5,
       "https://m.facebook.com/?refsrc=https%3A%2F%2Fwww.facebook.com%2F&_rdr");
 
   // Redirect with empty redirect_url will be deleted.
   predictor_->OnMainFrameRequest(yahoo);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRedirect(yahoo);
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 
   // Redirect without previous request works fine.
   // predictor_->OnMainFrameRequest(bbc1) missing.
@@ skipping 27 matching lines @@
   predictor_->OnMainFrameRedirect(fb3);
   predictor_->OnMainFrameRedirect(fb4);
   EXPECT_EQ(4U, predictor_->inflight_navigations_.size());
   EXPECT_EQ(fb1.navigation_id.main_frame_url,
             predictor_->inflight_navigations_[fb_end]->initial_url);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, OnSubresourceResponse) {
   // If there is no inflight navigation, nothing happens.
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      1, "http://www.google.com", "http://google.com/style1.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->OnSubresourceResponse(resource1);
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 
   // Add an inflight navigation.
   URLRequestSummary main_frame1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
+      1, "http://www.google.com", "http://www.google.com",
       content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->OnMainFrameRequest(main_frame1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   // Now add a few subresources.
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      1, "http://www.google.com", "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   URLRequestSummary resource3 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://google.com/script2.js",
+      1, "http://www.google.com", "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->OnSubresourceResponse(resource1);
   predictor_->OnSubresourceResponse(resource2);
   predictor_->OnSubresourceResponse(resource3);
 
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
   EXPECT_EQ(3U, predictor_->inflight_navigations_[main_frame1.navigation_id]
                     ->subresource_requests.size());
   EXPECT_TRUE(URLRequestSummaryAreEqual(
       resource1, predictor_->inflight_navigations_[main_frame1.navigation_id]
@@ skipping 29 matching lines @@
       content::RESOURCE_TYPE_XHR, ""));
   EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
       content::RESOURCE_TYPE_XHR, "bogus/mime-type"));
   EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
       content::RESOURCE_TYPE_XHR, "application/javascript"));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ShouldRecordRequestMainFrame) {
   std::unique_ptr<net::URLRequest> http_request =
       CreateURLRequest(GURL("http://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+                       content::RESOURCE_TYPE_IMAGE, true);
   EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordRequest(
       http_request.get(), content::RESOURCE_TYPE_MAIN_FRAME));
 
   std::unique_ptr<net::URLRequest> https_request =
       CreateURLRequest(GURL("https://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+                       content::RESOURCE_TYPE_IMAGE, true);
   EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordRequest(
       https_request.get(), content::RESOURCE_TYPE_MAIN_FRAME));
 
   std::unique_ptr<net::URLRequest> file_request =
       CreateURLRequest(GURL("file://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+                       content::RESOURCE_TYPE_IMAGE, true);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
       file_request.get(), content::RESOURCE_TYPE_MAIN_FRAME));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ShouldRecordRequestSubResource) {
   std::unique_ptr<net::URLRequest> http_request =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, false);
+                       content::RESOURCE_TYPE_IMAGE, false);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
       http_request.get(), content::RESOURCE_TYPE_IMAGE));
 
   std::unique_ptr<net::URLRequest> https_request =
       CreateURLRequest(GURL("https://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, false);
+                       content::RESOURCE_TYPE_IMAGE, false);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
       https_request.get(), content::RESOURCE_TYPE_IMAGE));
 
   std::unique_ptr<net::URLRequest> file_request =
       CreateURLRequest(GURL("file://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, false);
+                       content::RESOURCE_TYPE_IMAGE, false);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
       file_request.get(), content::RESOURCE_TYPE_IMAGE));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ShouldRecordResponseMainFrame) {
   net::HttpResponseInfo response_info;
   response_info.headers = MakeResponseHeaders("");
   url_request_job_factory_.set_response_info(response_info);
 
   std::unique_ptr<net::URLRequest> http_request =
       CreateURLRequest(GURL("http://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, 1, 1, true);
+                       content::RESOURCE_TYPE_MAIN_FRAME, true);
   EXPECT_TRUE(
       ResourcePrefetchPredictor::ShouldRecordResponse(http_request.get()));
 
   std::unique_ptr<net::URLRequest> https_request =
       CreateURLRequest(GURL("https://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, 1, 1, true);
+                       content::RESOURCE_TYPE_MAIN_FRAME, true);
   EXPECT_TRUE(
       ResourcePrefetchPredictor::ShouldRecordResponse(https_request.get()));
 
   std::unique_ptr<net::URLRequest> file_request =
       CreateURLRequest(GURL("file://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, 1, 1, true);
+                       content::RESOURCE_TYPE_MAIN_FRAME, true);
   EXPECT_FALSE(
       ResourcePrefetchPredictor::ShouldRecordResponse(file_request.get()));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ShouldRecordResponseSubresource) {
   net::HttpResponseInfo response_info;
   response_info.headers =
       MakeResponseHeaders("HTTP/1.1 200 OK\n\nSome: Headers\n");
   response_info.was_cached = true;
   url_request_job_factory_.set_response_info(response_info);
 
   // Protocol.
   std::unique_ptr<net::URLRequest> http_image_request =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+                       content::RESOURCE_TYPE_IMAGE, true);
   EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
       http_image_request.get()));
 
   std::unique_ptr<net::URLRequest> https_image_request =
       CreateURLRequest(GURL("https://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+                       content::RESOURCE_TYPE_IMAGE, true);
   EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
       https_image_request.get()));
 
   std::unique_ptr<net::URLRequest> file_image_request =
       CreateURLRequest(GURL("file://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+                       content::RESOURCE_TYPE_IMAGE, true);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
       file_image_request.get()));
 
   // ResourceType.
   std::unique_ptr<net::URLRequest> sub_frame_request =
       CreateURLRequest(GURL("http://www.google.com/frame.html"), net::MEDIUM,
-                       content::RESOURCE_TYPE_SUB_FRAME, 1, 1, true);
+                       content::RESOURCE_TYPE_SUB_FRAME, true);
   EXPECT_FALSE(
       ResourcePrefetchPredictor::ShouldRecordResponse(sub_frame_request.get()));
 
-  std::unique_ptr<net::URLRequest> font_request = CreateURLRequest(
-      GURL("http://www.google.com/comic-sans-ms.woff"), net::MEDIUM,
-      content::RESOURCE_TYPE_FONT_RESOURCE, 1, 1, true);
+  std::unique_ptr<net::URLRequest> font_request =
+      CreateURLRequest(GURL("http://www.google.com/comic-sans-ms.woff"),
+                       net::MEDIUM, content::RESOURCE_TYPE_FONT_RESOURCE, true);
   EXPECT_TRUE(
       ResourcePrefetchPredictor::ShouldRecordResponse(font_request.get()));
 
   // From MIME Type.
   url_request_job_factory_.set_mime_type("image/png");
   std::unique_ptr<net::URLRequest> prefetch_image_request =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, 1, 1, true);
+                       content::RESOURCE_TYPE_PREFETCH, true);
   EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
       prefetch_image_request.get()));
 
   url_request_job_factory_.set_mime_type("image/my-wonderful-format");
   std::unique_ptr<net::URLRequest> prefetch_unknown_image_request =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, 1, 1, true);
+                       content::RESOURCE_TYPE_PREFETCH, true);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
       prefetch_unknown_image_request.get()));
 
   url_request_job_factory_.set_mime_type("font/woff");
-  std::unique_ptr<net::URLRequest> prefetch_font_request = CreateURLRequest(
-      GURL("http://www.google.com/comic-sans-ms.woff"), net::MEDIUM,
-      content::RESOURCE_TYPE_PREFETCH, 1, 1, true);
+  std::unique_ptr<net::URLRequest> prefetch_font_request =
+      CreateURLRequest(GURL("http://www.google.com/comic-sans-ms.woff"),
+                       net::MEDIUM, content::RESOURCE_TYPE_PREFETCH, true);
   EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
       prefetch_font_request.get()));
 
   url_request_job_factory_.set_mime_type("font/woff-woff");
   std::unique_ptr<net::URLRequest> prefetch_unknown_font_request =
       CreateURLRequest(GURL("http://www.google.com/comic-sans-ms.woff"),
-                       net::MEDIUM, content::RESOURCE_TYPE_PREFETCH, 1, 1,
-                       true);
+                       net::MEDIUM, content::RESOURCE_TYPE_PREFETCH, true);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
       prefetch_unknown_font_request.get()));
 
   // Not main frame.
   std::unique_ptr<net::URLRequest> font_request_sub_frame = CreateURLRequest(
       GURL("http://www.google.com/comic-sans-ms.woff"), net::MEDIUM,
-      content::RESOURCE_TYPE_FONT_RESOURCE, 1, 1, false);
+      content::RESOURCE_TYPE_FONT_RESOURCE, false);
   EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
       font_request_sub_frame.get()));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponse) {
   net::HttpResponseInfo response_info;
   response_info.headers =
       MakeResponseHeaders("HTTP/1.1 200 OK\n\nSome: Headers\n");
   response_info.was_cached = true;
   url_request_job_factory_.set_response_info(response_info);
 
   GURL url("http://www.google.com/cat.png");
-  std::unique_ptr<net::URLRequest> request = CreateURLRequest(
-      url, net::MEDIUM, content::RESOURCE_TYPE_IMAGE, 1, 1, true);
+  std::unique_ptr<net::URLRequest> request =
+      CreateURLRequest(url, net::MEDIUM, content::RESOURCE_TYPE_IMAGE, true);
   URLRequestSummary summary;
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request, &summary));
   EXPECT_EQ(url, summary.resource_url);
   EXPECT_EQ(content::RESOURCE_TYPE_IMAGE, summary.resource_type);
   EXPECT_TRUE(summary.was_cached);
   EXPECT_FALSE(summary.has_validators);
   EXPECT_FALSE(summary.always_revalidate);
 
   // Navigation_id elements should be unset by default.
-  EXPECT_EQ(-1, summary.navigation_id.render_process_id);
-  EXPECT_EQ(-1, summary.navigation_id.render_frame_id);
+  EXPECT_EQ(-1, summary.navigation_id.session_id);
   EXPECT_EQ(GURL(), summary.navigation_id.main_frame_url);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponseContentType) {
   net::HttpResponseInfo response_info;
   response_info.headers = MakeResponseHeaders(
       "HTTP/1.1 200 OK\n\n"
       "Some: Headers\n"
       "Content-Type: image/whatever\n");
   url_request_job_factory_.set_response_info(response_info);
   url_request_job_factory_.set_mime_type("image/png");
 
   std::unique_ptr<net::URLRequest> request =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, 1, 1, true);
+                       content::RESOURCE_TYPE_PREFETCH, true);
   URLRequestSummary summary;
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request, &summary));
   EXPECT_EQ(content::RESOURCE_TYPE_IMAGE, summary.resource_type);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponseCachePolicy) {
   net::HttpResponseInfo response_info;
   response_info.headers = MakeResponseHeaders(
       "HTTP/1.1 200 OK\n"
       "Some: Headers\n");
   url_request_job_factory_.set_response_info(response_info);
 
   std::unique_ptr<net::URLRequest> request_no_validators =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, 1, 1, true);
+                       content::RESOURCE_TYPE_PREFETCH, true);
 
   URLRequestSummary summary;
   EXPECT_TRUE(
       URLRequestSummary::SummarizeResponse(*request_no_validators, &summary));
   EXPECT_FALSE(summary.has_validators);
 
   response_info.headers = MakeResponseHeaders(
       "HTTP/1.1 200 OK\n"
       "ETag: \"Cr66\"\n"
       "Cache-Control: no-cache\n");
   url_request_job_factory_.set_response_info(response_info);
   std::unique_ptr<net::URLRequest> request_etag =
       CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, 1, 1, true);
+                       content::RESOURCE_TYPE_PREFETCH, true);
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request_etag, &summary));
   EXPECT_TRUE(summary.has_validators);
   EXPECT_TRUE(summary.always_revalidate);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, PopulatePrefetcherRequest) {
   // The data that will be used in populating.
   PrefetchData google = CreatePrefetchData("http://www.google.com/", 1);
   InitializeResourceData(google.add_resources(), "http://google.com/image1.png",
                          content::RESOURCE_TYPE_IMAGE, 10, 0, 0, 2.2,
@@ skipping 161 matching lines @@
                          net::MEDIUM, false, false);
   predictor_->url_table_cache_->insert(
       std::make_pair(www_google_url.primary_key(), www_google_url));
 
   urls.clear();
   EXPECT_TRUE(predictor_->GetPrefetchData(main_frame_url, &urls));
   EXPECT_THAT(urls, UnorderedElementsAre(GURL(font_url)));
 }
 
 }  // namespace predictors