Get rid of the gears in renderer process code. This allows me to do some cle...

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 48 matching lines @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webplugin_delegate.h"
 #include "webkit/glue/webresponse.h"
 #include "webkit/glue/weburlrequest.h"
 #include "webkit/glue/webview.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * logging
-//   * plugins
 //   * printing
 //   * theming
 //   * views
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/renderer/renderer_logging.h"
 #include "chrome/views/message_box_view.h"
-#include "chrome/common/chrome_plugin_lib.h"
-#include "chrome/renderer/chrome_plugin_host.h"
 #include "skia/ext/vector_canvas.h"
 #endif
 
 #if defined(OS_WIN)
 // If true, the URL of the active renderer is logged. Logging is done in such
 // way that if the renderer crashes the URL of the active renderer is contained
 // in the dump. Currently mini-dumps are only supported on windows, so this is
 // only enabled on windows.
 #define LOG_RENDERER_URL
 #endif
@@ skipping 1772 matching lines @@
 }
 
 WebWidget* RenderView::CreatePopupWidget(WebView* webview,
                                          bool activatable) {
   RenderWidget* widget = RenderWidget::Create(routing_id_,
                                               render_thread_,
                                               activatable);
   return widget->webwidget();
 }
 
-#if defined(OS_WIN)
-// TODO(port): This is only used on Windows since the plugin code is #ifdefed
-// out for other platforms currently
-
-static bool ShouldLoadPluginInProcess(const std::string& mime_type,
-                                      bool* is_gears) {
-  if (RenderProcess::current()->in_process_plugins())
-    return true;
-
-  if (mime_type == "application/x-googlegears") {
-    *is_gears = true;
-    return RenderProcess::current()->in_process_gears();
-  }
-
-  return false;
-}
-#endif
-
 WebPluginDelegate* RenderView::CreatePluginDelegate(
     WebView* webview,
     const GURL& url,
     const std::string& mime_type,
     const std::string& clsid,
     std::string* actual_mime_type) {
 #if defined(OS_WIN)
-  bool is_gears = false;
-  if (ShouldLoadPluginInProcess(mime_type, &is_gears)) {
+  if (RenderProcess::current()->in_process_plugins()) {
     FilePath path;
     render_thread_->Send(
         new ViewHostMsg_GetPluginPath(url, mime_type, clsid, &path,
                                       actual_mime_type));
     if (path.value().empty())
       return NULL;
 
     std::string mime_type_to_use;
     if (actual_mime_type && !actual_mime_type->empty())
       mime_type_to_use = *actual_mime_type;
     else
       mime_type_to_use = mime_type;
 
-    if (is_gears)
-      ChromePluginLib::Create(path, GetCPBrowserFuncsForRenderer());
     return WebPluginDelegate::Create(path,
                                      mime_type_to_use,
                                      gfx::NativeViewFromId(host_window_));
   }
 
   WebPluginDelegateProxy* proxy =
       WebPluginDelegateProxy::Create(url, mime_type, clsid, this);
   if (!proxy)
     return NULL;
 
@@ skipping 1045 matching lines @@
   DCHECK(audio_renderers_.Lookup(stream_id) != NULL);
   Send(new ViewHostMsg_SetAudioVolume(routing_id_, stream_id, left, right));
 }
 
 void RenderView::OnResize(const gfx::Size& new_size,
                           const gfx::Rect& resizer_rect) {
   if (webview())
     webview()->HideAutofillPopup();
   RenderWidget::OnResize(new_size, resizer_rect);
 }