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

chrome/browser/tab_contents/web_contents_view_win.cc

 // Copyright (c) 2006-2008 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_win.h"
 
 #include <windows.h>
 
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/browser.h"  // TODO(beng): this dependency is awful.
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/dom_ui_host.h"
 #include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.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_win.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_win.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/tab_contents/web_drag_source.h"
 #include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/os_exchange_data.h"
@@ skipping 55 matching lines @@
 }
 
 RenderWidgetHostView* WebContentsViewWin::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();
   }
 
   RenderWidgetHostViewWin* view =
       new RenderWidgetHostViewWin(render_widget_host);
   view->Create(GetNativeView());
   view->ShowWindow(SW_SHOW);
   return view;
 }
 
@@ skipping 488 matching lines @@
   }
   return false;
 }
 
 void WebContentsViewWin::WheelZoom(int distance) {
   if (web_contents()->delegate()) {
     bool zoom_in = distance > 0;
     web_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }