Lots of small nits to help to split off webkit.dll....

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 24 matching lines @@
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
 #include "webkit/glue/glue_accessibility.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/weberror.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webhistoryitem.h"
 #include "webkit/glue/webinputevent.h"
 #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"
 
 #include "generated_resources.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * plugins
 //   * printing
@@ skipping 1823 matching lines @@
       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 WebPluginDelegateImpl::Create(path,
-                                         mime_type_to_use,
-                                         gfx::NativeViewFromId(host_window_));
+    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;
 
   // We hold onto the proxy so we can poke it when we are painting.  See our
   // DidPaint implementation below.
   plugin_delegates_.push_back(proxy);
@@ skipping 939 matching lines @@
 #if defined(OS_WIN)
   // "t" is the id of the templates root node.
   return jstemplate_builder::GetTemplateHtml(
       template_html, &error_strings, "t");
 #else
   // TODO(port)
   NOTIMPLEMENTED();
   return std::string();
 #endif  // OS_WIN
 }