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

chrome/browser/tab_contents/web_contents_view_gtk.cc

 // Copyright (c) 2009 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/web_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 
 namespace {
 
 // Called when the content view gtk widget is tabbed to. We always return true
 // and grab focus if we don't have it. The call to SetInitialFocus(bool)
 // forwards the tab to webkit. We leave focus via TakeFocus().
@@ skipping 53 matching lines @@
 }
 
 RenderWidgetHostView* WebContentsViewGtk::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   if (render_widget_host->view()) {
     // During testing, the view will already be set up in most cases to the
     // test view, so we don't want to clobber it with a real one. To verify that
     // this actually is happening (and somebody isn't accidentally creating the
     // view twice), we check for the RVH Factory, which will be set when we're
     // making special ones (which go along with the special views).
-    DCHECK(web_contents()->render_manager()->has_render_view_host_factory());
+    DCHECK(RenderViewHostFactory::has_factory());
     return render_widget_host->view();
   }
 
   RenderWidgetHostViewGtk* view =
       new RenderWidgetHostViewGtk(render_widget_host);
   view->InitAsChild();
   content_view_ = view->native_view();
   g_signal_connect(content_view_, "focus",
                    G_CALLBACK(OnFocus), web_contents());
   g_signal_connect(view->native_view(), "leave-notify-event",
@@ skipping 142 matching lines @@
   // TODO(port): remove me when the above NOTIMPLEMENTED is fixed.
   if (web_contents()->render_view_host())
     web_contents()->render_view_host()->DragSourceSystemDragEnded();
 }
 
 gboolean WebContentsViewGtk::OnMouseDown(GtkWidget* widget,
     GdkEventButton* event, WebContentsViewGtk* view) {
   view->last_mouse_down_time_ = event->time;
   return FALSE;
 }