Move more of the plugin code in the renderer to use RenderFrame instead of RenderView.

content/browser/loader/resource_request_info_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 27 matching lines @@
   // And, a const version for cases where you only need read access.
   CONTENT_EXPORT static const ResourceRequestInfoImpl* ForRequest(
       const net::URLRequest* request);
 
   CONTENT_EXPORT ResourceRequestInfoImpl(
       int process_type,
       int child_id,
       int route_id,
       int origin_pid,
       int request_id,
+      int render_frame_id,
       bool is_main_frame,
       int64 frame_id,
       bool parent_is_main_frame,
       int64 parent_frame_id,
       ResourceType::Type resource_type,
       PageTransition transition_type,
       bool should_replace_current_entry,
       bool is_download,
       bool is_stream,
       bool allow_download,
       bool has_user_gesture,
       blink::WebReferrerPolicy referrer_policy,
       ResourceContext* context,
       base::WeakPtr<ResourceMessageFilter> filter,
       bool is_async);
   virtual ~ResourceRequestInfoImpl();
 
   // ResourceRequestInfo implementation:
   virtual ResourceContext* GetContext() const OVERRIDE;
   virtual int GetChildID() const OVERRIDE;
   virtual int GetRouteID() const OVERRIDE;
   virtual int GetOriginPID() const OVERRIDE;
   virtual int GetRequestID() const OVERRIDE;
+  virtual int GetRenderFrameID() const OVERRIDE;
   virtual bool IsMainFrame() const OVERRIDE;
   virtual int64 GetFrameID() const OVERRIDE;
   virtual bool ParentIsMainFrame() const OVERRIDE;
   virtual int64 GetParentFrameID() const OVERRIDE;
   virtual ResourceType::Type GetResourceType() const OVERRIDE;
   virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE;
   virtual PageTransition GetPageTransition() const OVERRIDE;
   virtual bool HasUserGesture() const OVERRIDE;
   virtual bool WasIgnoredByHandler() const OVERRIDE;
   virtual bool GetAssociatedRenderView(int* render_process_id,
@@ skipping 76 matching lines @@
                            DeletedFilterDetachedRedirect);
   // Non-owning, may be NULL.
   CrossSiteResourceHandler* cross_site_handler_;
   DetachableResourceHandler* detachable_handler_;
 
   int process_type_;
   int child_id_;
   int route_id_;
   int origin_pid_;
   int request_id_;
+  int render_frame_id_;
   bool is_main_frame_;
   int64 frame_id_;
   bool parent_is_main_frame_;
   int64 parent_frame_id_;
   bool should_replace_current_entry_;
   bool is_download_;
   bool is_stream_;
   bool allow_download_;
   bool has_user_gesture_;
   bool was_ignored_by_handler_;
   ResourceType::Type resource_type_;
   PageTransition transition_type_;
   int memory_cost_;
   blink::WebReferrerPolicy referrer_policy_;
   ResourceContext* context_;
   // The filter might be deleted without deleting this object if the process
   // exits during a transfer.
   base::WeakPtr<ResourceMessageFilter> filter_;
   bool is_async_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceRequestInfoImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_REQUEST_INFO_IMPL_H_