[RDHI] Refactored blocked_loaders_map_ to key by render frame route id

content/browser/loader/global_routing_id.h

Index: content/browser/loader/global_routing_id.h
diff --git a/content/browser/loader/global_routing_id.h b/content/browser/loader/global_routing_id.h
index df5f202c22e568612508915e54f9fa4d753d83a9..97958fb8971e58e9a8c30c4ea8c60c506165c0f1 100644
--- a/content/browser/loader/global_routing_id.h
+++ b/content/browser/loader/global_routing_id.h
@@ -38,6 +38,13 @@ struct GlobalRoutingID {
   }
 };
 
+// Same as GlobalRoutingID except the route_id must be a render frame routing
+// id.
+struct GlobalFrameRoutingId : public GlobalRoutingID {

[nasko, 2016/01/07 00:43:09]

Is it possible to avoid the inheritance? It will allow us to use the compiler to
enforce type safety and as it is, this looks dangerous.

[Charlie Harrison, 2016/01/07 22:47:05]

Yeah it's possible, we just need to copy the boilerplate. Done.

+  GlobalFrameRoutingId(int child_id, int render_frame_route_id)
+      : GlobalRoutingID(child_id, render_frame_route_id) {}
+};
+
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_GLOBAL_ROUTING_ID_H_