Make the RenderViewHostFactory a global. This prevents us from having to pass...

chrome/browser/external_tab_container.cc

Index: chrome/browser/external_tab_container.cc
===================================================================
--- chrome/browser/external_tab_container.cc	(revision 13136)
+++ chrome/browser/external_tab_container.cc	(working copy)
@@ -64,21 +64,12 @@
 
   DCHECK(focus_manager);
   focus_manager->AddKeystrokeListener(this);
-  tab_contents_ = TabContents::CreateWithType(TAB_CONTENTS_WEB, profile,
-                                              NULL, NULL);
-  if (!tab_contents_) {
-    NOTREACHED();
-    DestroyWindow();
-    return false;
-  }
 
+  tab_contents_ = new WebContents(profile, NULL, MSG_ROUTING_NONE, NULL);
   tab_contents_->SetupController(profile);
   tab_contents_->set_delegate(this);
+  tab_contents_->render_view_host()->AllowExternalHostBindings();
 
-  WebContents* web_conents = tab_contents_->AsWebContents();
-  if (web_conents)
-    web_conents->render_view_host()->AllowExternalHostBindings();
-
   // Create a TabContentsContainerView to handle focus cycling using Tab and
   // Shift-Tab.
   tab_contents_container_ = new TabContentsContainerView();
@@ -402,7 +393,7 @@
 void ExternalTabContainer::SetInitialFocus(bool reverse) {
   DCHECK(tab_contents_);
   if (tab_contents_) {
-    tab_contents_->SetInitialFocus(reverse);
+    static_cast<TabContents*>(tab_contents_)->SetInitialFocus(reverse);
   }
 }