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

chrome/plugin/webplugin_delegate_stub.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/plugin/webplugin_delegate_stub.h"
 
 #include "base/command_line.h"
 #include "base/time.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/win_util.h"
 #include "chrome/plugin/npobject_stub.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "skia/ext/platform_device.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
+#include "webkit/glue/webplugin_delegate.h"
 
 class FinishDestructionTask : public Task {
  public:
   FinishDestructionTask(WebPluginDelegate* delegate, WebPlugin* webplugin)
     : delegate_(delegate), webplugin_(webplugin) { }
 
   void Run() {
     // WebPlugin must outlive WebPluginDelegate.
     if (delegate_)
       delegate_->PluginDestroyed();
@@ skipping 87 matching lines @@
   char **argn = new char*[argc];
   char **argv = new char*[argc];
   for (int i = 0; i < argc; ++i) {
     argn[i] = const_cast<char*>(params.arg_names[i].c_str());
     argv[i] = const_cast<char*>(params.arg_values[i].c_str());
   }
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   FilePath path =
       FilePath(command_line.GetSwitchValue(switches::kPluginPath));
-  delegate_ = WebPluginDelegateImpl::Create(
+  delegate_ = WebPluginDelegate::Create(
       path, mime_type_, params.containing_window);
   if (delegate_) {
     webplugin_ = new WebPluginProxy(
         channel_, instance_id_, delegate_, params.modal_dialog_event);
     *result = delegate_->Initialize(
         params.url, argn, argv, argc, webplugin_, params.load_manually);
   }
 
   delete[] argn;
   delete[] argv;
@@ skipping 193 matching lines @@
                                       params.stream);
   webplugin_->OnResourceCreated(params.resource_id, resource_client);
 }
 
 void WebPluginDelegateStub::OnURLRequestRouted(const std::string& url,
                                                bool notify_needed,
                                                HANDLE notify_data) {
   delegate_->URLRequestRouted(url, notify_needed, notify_data);
 }