Update resource requests to remove redundant frame ID.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 209b20bd42ea3ed1cf75a673d3d1c1ef659e9f85..5c3bc49060cefcd6c54f380cadfc7da6857c7edf 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -855,7 +855,7 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
     blink::WebFrame* frame,
     const WebPluginInfo& info,
     const blink::WebPluginParams& params) {
-  // TODO(creis): |frame| is different from |frame_| here.  This seems wrong.
+  DCHECK(!frame_ || frame_ == frame);

[Charlie Reis, 2014/02/28 23:26:49]

Daniel: You're right that these two {C|c}reatePlugin checks seem to work now. 
Thanks for fixing it!

[dcheng, 2014/02/28 23:28:22]

Random question: Why would frame_ be NULL here? Is that, in fact, a problem?

[Charlie Reis, 2014/02/28 23:31:11]

I used that in all the other checks because an unpredictably large number of
WebFrameClient methods could be called after the WebFrame was created and before
it was assigned to frame_.  I don't know if this is one of them-- should I
remove that condition?

 #if defined(ENABLE_PLUGINS)
   bool pepper_plugin_was_registered = false;
   scoped_refptr<PluginModule> pepper_module(PluginModule::Create(
@@ -895,7 +895,7 @@ void RenderFrameImpl::OnChildFrameProcessGone() {
 blink::WebPlugin* RenderFrameImpl::createPlugin(
     blink::WebFrame* frame,
     const blink::WebPluginParams& params) {
-  // TODO(creis): |frame| is different from |frame_| here.  This seems wrong.
+  DCHECK(!frame_ || frame_ == frame);
   blink::WebPlugin* plugin = NULL;
   if (GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
@@ -1680,9 +1680,6 @@ void RenderFrameImpl::willSendRequest(
     should_replace_current_entry =
         navigation_state->should_replace_current_entry();
   }
-  // TODO(creis): Remove the second routing ID from the request, now that we
-  // use routing IDs instead of frame IDs.  (This is a viral change, so I'm
-  // splitting it into multiple CLs.)
   int parent_routing_id = frame->parent() ?
       FromWebFrame(frame->parent())->GetRoutingID() : -1;
   request.setExtraData(
@@ -1691,7 +1688,6 @@ void RenderFrameImpl::willSendRequest(
                            was_after_preconnect_request,
                            routing_id_,
                            (frame == top_frame),
-                           routing_id_,
                            GURL(frame->document().securityOrigin().toString()),
                            frame->parent() == top_frame,
                            parent_routing_id,