Move routing to RenderFrameHost instead of RenderViewHost.

chrome/browser/tab_contents/tab_util.cc

 // 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.
 
 #include "chrome/browser/tab_contents/tab_util.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/chrome_switches.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
+using content::RenderFrameHost;
 using content::RenderViewHost;
 using content::SiteInstance;
 using content::WebContents;
 
 namespace tab_util {
 
 content::WebContents* GetWebContentsByID(int render_process_id,
                                          int render_view_id) {
   RenderViewHost* render_view_host =
       RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!render_view_host)
-    return NULL;
+  if (!render_view_host) {
+    RenderFrameHost* render_frame_host =
+        RenderFrameHost::FromID(render_process_id, render_view_id);
+    if (!render_frame_host)
+      return NULL;
+
+    return WebContents::FromRenderViewHost(
+        render_frame_host->GetRenderViewHost());
+  }
 
   return WebContents::FromRenderViewHost(render_view_host);
 }
 
 SiteInstance* GetSiteInstanceForNewTab(Profile* profile,
                                        const GURL& url) {
   // If url is a WebUI or extension, we need to be sure to use the right type
   // of renderer process up front.  Otherwise, we create a normal SiteInstance
   // as part of creating the tab.
   ExtensionService* service = profile->GetExtensionService();
   if (ChromeWebUIControllerFactory::GetInstance()->UseWebUIForURL(
           profile, url) ||
       (service &&
        service->extensions()->GetHostedAppByURL(url))) {
     return SiteInstance::CreateForURL(profile, url);
   }
 
   // We used to share the SiteInstance for same-site links opened in new tabs,
   // to leverage the in-memory cache and reduce process creation.  It now
   // appears that it is more useful to have such links open in a new process.
   return NULL;
 }
 
 }  // namespace tab_util