predictors: Make speculative_prefetch_predictor work with PlzNavigate

chrome/browser/predictors/resource_prefetch_predictor_test_util.cc

Index: chrome/browser/predictors/resource_prefetch_predictor_test_util.cc
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_test_util.cc b/chrome/browser/predictors/resource_prefetch_predictor_test_util.cc
index fc73ff3caee42b7111b58bcae73ab5d806c8e4e4..3b3a074cc0151ed72de14f881cf046b4aa4985ff 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_test_util.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_test_util.cc
@@ -60,12 +60,12 @@ RedirectData CreateRedirectData(const std::string& primary_key,
   return data;
 }
 
-NavigationID CreateNavigationID(int process_id,
-                                int render_frame_id,
+NavigationID CreateNavigationID(int session_id,
+                                int frame_tree_node_id,
                                 const std::string& main_frame_url) {
   NavigationID navigation_id;
-  navigation_id.render_process_id = process_id;
-  navigation_id.render_frame_id = render_frame_id;
+  navigation_id.session_id.set_id(session_id);
+  navigation_id.frame_tree_node_id = frame_tree_node_id;
   navigation_id.main_frame_url = GURL(main_frame_url);
   navigation_id.creation_time = base::TimeTicks::Now();
   return navigation_id;
@@ -158,11 +158,21 @@ std::ostream& operator<<(std::ostream& os, const URLRequestSummary& summary) {
 }
 
 std::ostream& operator<<(std::ostream& os, const NavigationID& navigation_id) {
-  return os << navigation_id.render_process_id << ","
-            << navigation_id.render_frame_id << ","
+  return os << navigation_id.session_id.id() << ","
+            << navigation_id.frame_tree_node_id << ","
             << navigation_id.main_frame_url;
 }
 
+std::ostream& operator<<(
+    std::ostream& os,
+    const std::map<NavigationID, std::unique_ptr<PageRequestSummary>>& map) {
+  os << "Navigation Map, " << map.size() << " elements" << std::endl;
+  int i = 0;
+  for (auto nav_it = map.begin(); nav_it != map.end(); ++nav_it, ++i)
+    os << "Element " << i << ": " << nav_it->first << std::endl;
+  return os;
+}
+
 bool operator==(const PrefetchData& lhs, const PrefetchData& rhs) {
   bool equal = lhs.primary_key() == rhs.primary_key() &&
                lhs.resources_size() == rhs.resources_size();