Fix the deadlock when Flash tries to make WMP full screen. This is a one-off...

webkit/glue/plugins/webplugin_delegate_impl_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 "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 232 matching lines @@
       dummy_window_for_activation_(NULL),
       handle_event_message_filter_hook_(NULL),
       handle_event_pump_messages_event_(NULL),
       handle_event_depth_(0),
       user_gesture_message_posted_(false),
 #pragma warning(suppress: 4355)  // can use this
       user_gesture_msg_factory_(this) {
   memset(&window_, 0, sizeof(window_));
 
   const WebPluginInfo& plugin_info = instance_->plugin_lib()->plugin_info();
-  std::string filename =
-      WideToUTF8(StringToLowerASCII(plugin_info.path.BaseName().value()));
+  std::wstring filename = StringToLowerASCII(plugin_info.path.BaseName().value());
 
   if (instance_->mime_type() == "application/x-shockwave-flash" ||
-      filename == "npswf32.dll") {
+      filename == kFlashPlugin) {
     // Flash only requests windowless plugins if we return a Mozilla user
     // agent.
     instance_->set_use_mozilla_user_agent();
     quirks_ |= PLUGIN_QUIRK_THROTTLE_WM_USER_PLUS_ONE;
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
-  } else if (filename == "nppdf32.dll") {
+  } else if (filename == kAcrobatReaderPlugin) {
     // Check for the version number above or equal 9.
     std::vector<std::wstring> version;
     SplitString(plugin_info.version, L'.', &version);
     if (version.size() > 0) {
       int major = static_cast<int>(StringToInt64(version[0]));
       if (major >= 9) {
         quirks_ |= PLUGIN_QUIRK_DIE_AFTER_UNLOAD;
       }
     }
     quirks_ |= PLUGIN_QUIRK_BLOCK_NONSTANDARD_GETURL_REQUESTS;
   } else if (plugin_info.name.find(L"Windows Media Player") !=
              std::wstring::npos) {
     // Windows Media Player needs two NPP_SetWindow calls.
     quirks_ |= PLUGIN_QUIRK_SETWINDOW_TWICE;
 
     // Windowless mode doesn't work in the WMP NPAPI plugin.
     quirks_ |= PLUGIN_QUIRK_NO_WINDOWLESS;
 
-    // Non-admin users on XP couldn't modify the key to force the new UI.
-    quirks_ |= PLUGIN_QUIRK_PATCH_REGENUMKEYEXW;
+    if (filename == kOldWMPPlugin) {
+      // Non-admin users on XP couldn't modify the key to force the new UI.
+      quirks_ |= PLUGIN_QUIRK_PATCH_REGENUMKEYEXW;
+    }
   } else if (instance_->mime_type() == "audio/x-pn-realaudio-plugin" ||
-             filename == "nppl3260.dll") {
+             filename == kRealPlayerPlugin) {
     quirks_ |= PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY;
   } else if (plugin_info.name.find(L"VLC Multimedia Plugin") !=
              std::wstring::npos ||
              plugin_info.name.find(L"VLC Multimedia Plug-in") !=
              std::wstring::npos) {
     // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
     // handle
     quirks_ |= PLUGIN_QUIRK_DONT_SET_NULL_WINDOW_HANDLE_ON_DESTROY;
     // VLC 0.8.6d and 0.8.6e crash if multiple instances are created.
     quirks_ |= PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES;
-  } else if (filename == "npctrl.dll") {  // Silverlight
+  } else if (filename == kSilverlightPlugin) {
     // Explanation for this quirk can be found in
     // WebPluginDelegateImpl::Initialize.
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
   }
 }
 
 WebPluginDelegateImpl::~WebPluginDelegateImpl() {
   if (::IsWindow(dummy_window_for_activation_)) {
     ::DestroyWindow(dummy_window_for_activation_);
   }
@@ skipping 949 matching lines @@
       GetKeyPath(key).find(L"Microsoft\\MediaPlayer\\ShimInclusionList") !=
           std::wstring::npos) {
     static const wchar_t kChromeExeName[] = L"chrome.exe";
     wcsncpy_s(name, orig_size, kChromeExeName, arraysize(kChromeExeName));
     *name_size =
         std::min(orig_size, static_cast<DWORD>(arraysize(kChromeExeName)));
   }
 
   return rv;
 }