This changelist fixes some issues with the NPAPI WMP plugin work in Chrome. ...

chrome/plugin/webplugin_proxy.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/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "app/gfx/canvas.h"
 #if defined(OS_WIN)
@@ skipping 12 matching lines @@
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_delegate_stub.h"
 #include "skia/ext/platform_device.h"
 #include "webkit/api/public/WebBindings.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
-#include "webkit/glue/webplugin_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/gfx/gdi_util.h"
 #endif
 
 using WebKit::WebBindings;
-using webkit_glue::WebPluginDelegate;
 using webkit_glue::WebPluginResourceClient;
 
 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
 static ContextMap& GetContextMap() {
   return *Singleton<ContextMap>::get();
 }
 
 WebPluginProxy::WebPluginProxy(
     PluginChannel* channel,
     int route_id,
@@ skipping 252 matching lines @@
                                       bool popups_allowed) {
   if (!url) {
     NOTREACHED();
     return;
   }
 
   if (!target && (0 == base::strcasecmp(method, "GET"))) {
     // Please refer to https://bugzilla.mozilla.org/show_bug.cgi?id=366082
     // for more details on this.
     if (delegate_->GetQuirks() &
-        WebPluginDelegate::PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) {
+        WebPluginDelegateImpl::PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS) {
       GURL request_url(url);
       if (!request_url.SchemeIs(chrome::kHttpScheme) &&
           !request_url.SchemeIs(chrome::kHttpsScheme) &&
           !request_url.SchemeIs(chrome::kFtpScheme)) {
         return;
       }
     }
   }
 
   PluginHostMsg_URLRequest_Params params;
@@ skipping 330 matching lines @@
   while (index != resource_clients_.end()) {
     WebPluginResourceClient* client = (*index).second;
 
     if (client == resource_client) {
       resource_clients_.erase(index++);
     } else {
       index++;
     }
   }
 }