Convert remaining WebContentsObservers loading callbacks to use RFH.

chrome/browser/guest_view/web_view/web_view_guest.cc

Index: chrome/browser/guest_view/web_view/web_view_guest.cc
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
index 88471a8558b8ab48ecaa102d4a700606639de40e..0eaf1d71e21376251e683330176408f4053a892c 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -218,7 +218,6 @@ WebViewGuest::WebViewGuest(content::BrowserContext* browser_context,
       pending_context_menu_request_id_(0),
       next_permission_request_id_(0),
       is_overriding_user_agent_(false),
-      main_frame_id_(0),
       chromevox_injected_(false),
       find_helper_(this),
       javascript_dialog_helper_(this) {
@@ -1031,10 +1030,8 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame(
   current_zoom_factor_ = content::ZoomLevelToZoomFactor(
       content::HostZoomMap::GetZoomLevel(guest_web_contents()));
 
-  if (!render_frame_host->GetParent()) {
+  if (!render_frame_host->GetParent())
     chromevox_injected_ = false;
-    main_frame_id_ = render_frame_host->GetRoutingID();
-  }
 }
 
 void WebViewGuest::DidFailProvisionalLoad(
@@ -1062,10 +1059,9 @@ void WebViewGuest::DidStartProvisionalLoadForFrame(
 }
 
 void WebViewGuest::DocumentLoadedInFrame(
-    int64 frame_id,
-    content::RenderViewHost* render_view_host) {
-  if (frame_id == main_frame_id_)
-    InjectChromeVoxIfNeeded(render_view_host);
+    content::RenderFrameHost* render_frame_host) {
+  if (!render_frame_host->GetParent())
+    InjectChromeVoxIfNeeded(render_frame_host->GetRenderViewHost());
 }
 
 bool WebViewGuest::OnMessageReceived(const IPC::Message& message,