Convert remaining WebContentsObservers loading callbacks to use RFH.

chrome/browser/guest_view/web_view/web_view_guest.h

 // Copyright 2014 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 CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 
 #include <vector>
 
 #include "base/observer_list.h"
@@ skipping 341 matching lines @@
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
       const base::string16& error_description) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       bool is_error_page,
       bool is_iframe_srcdoc) OVERRIDE;
   virtual void DocumentLoadedInFrame(
-      int64 frame_id,
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::RenderFrameHost* render_frame_host) OVERRIDE;
   virtual bool OnMessageReceived(
       const IPC::Message& message,
       content::RenderFrameHost* render_frame_host) OVERRIDE;
   virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
   virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE;
   virtual void RenderViewReady() OVERRIDE;
 
   // Informs the embedder of a frame name change.
   void ReportFrameNameChange(const std::string& name);
 
@@ skipping 69 matching lines @@
   // A counter to generate a unique request id for a permission request.
   // We only need the ids to be unique for a given WebViewGuest.
   int next_permission_request_id_;
 
   typedef std::map<int, PermissionResponseInfo> RequestMap;
   RequestMap pending_permission_requests_;
 
   // True if the user agent is overridden.
   bool is_overriding_user_agent_;
 
-  // Main frame ID of last committed page.
-  int64 main_frame_id_;
-
   // Set to |true| if ChromeVox was already injected in main frame.
   bool chromevox_injected_;
 
   // Stores the current zoom factor.
   double current_zoom_factor_;
 
   // Stores the window name of the main frame of the guest.
   std::string name_;
 
   // Handles find requests and replies for the webview find API.
@@ skipping 29 matching lines @@
         changed(false) {}
   };
 
   typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
   PendingWindowMap pending_new_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
 };
 
 #endif  // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_