predictors: Make speculative_prefetch_predictor work with PlzNavigate

chrome/browser/predictors/resource_prefetch_common.h

Index: chrome/browser/predictors/resource_prefetch_common.h
diff --git a/chrome/browser/predictors/resource_prefetch_common.h b/chrome/browser/predictors/resource_prefetch_common.h
index afbd9240545ce0846f09f6818db313f583d4ee85..037a03b6929925b4b34c61e72a06a7841fc8975b 100644
--- a/chrome/browser/predictors/resource_prefetch_common.h
+++ b/chrome/browser/predictors/resource_prefetch_common.h
@@ -8,6 +8,8 @@
 #include <stddef.h>
 
 #include "base/time/time.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
+#include "components/sessions/core/session_id.h"
 #include "url/gurl.h"
 
 class Profile;
@@ -43,17 +45,17 @@ struct NavigationID {
                const GURL& main_frame_url,
                const base::TimeTicks& creation_time);
   NavigationID(const NavigationID& other);
+
   bool operator<(const NavigationID& rhs) const;
   bool operator==(const NavigationID& rhs) const;
-
-  bool IsSameRenderer(const NavigationID& other) const;
+  bool IsSameLocation(const NavigationID& other) const;

[ahemery, 2016/12/19 14:53:41]

Simple renaming to be more accurate with the new ids

 
   // Returns true iff the render_process_id_, render_frame_id_ and
   // frame_url_ has been set correctly.
   bool is_valid() const;
 
-  int render_process_id;
-  int render_frame_id;
+  SessionID session_id;
+  int frame_tree_node_id;
   GURL main_frame_url;
 
   // NOTE: Even though we store the creation time here, it is not used during