Merge 133096 - Don't search root paths for MS WMP plugin

webkit/plugins/npapi/plugin_list_win.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/plugins/npapi/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 146 matching lines @@
   FilePath path;
   if (GetInstalledPath(kRegistryQuickTime, &path))
     plugin_dirs->insert(path.Append(L"plugins"));
 }
 
 // Hardcoded logic to detect Windows Media Player plugin location.
 void GetWindowsMediaDirectory(std::set<FilePath>* plugin_dirs) {
   FilePath path;
   if (GetInstalledPath(kRegistryWindowsMedia, &path))
     plugin_dirs->insert(path);
-
-  // If the Windows Media Player Firefox plugin is installed before Firefox,
-  // the plugin will get written under PFiles\Plugins on one the drives
-  // (usually, but not always, the last letter).
-  int size = GetLogicalDriveStrings(0, NULL);
-  if (size) {
-    scoped_array<wchar_t> strings(new wchar_t[size]);
-    if (GetLogicalDriveStrings(size, strings.get())) {
-      wchar_t* next_drive = strings.get();
-      while (*next_drive) {
-        if (GetDriveType(next_drive) == DRIVE_FIXED) {
-          FilePath pfiles(next_drive);
-          pfiles = pfiles.Append(L"PFiles\\Plugins");
-          if (file_util::PathExists(pfiles))
-            plugin_dirs->insert(pfiles);
-        }
-        next_drive = &next_drive[wcslen(next_drive) + 1];
-      }
-    }
-  }
 }
 
 // Hardcoded logic to detect Java plugin location.
 void GetJavaDirectory(std::set<FilePath>* plugin_dirs) {
   // Load the new NPAPI Java plugin
   // 1. Open the main JRE key under HKLM
   base::win::RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava,
                              KEY_QUERY_VALUE);
 
   // 2. Read the current Java version
@@ skipping 246 matching lines @@
 
     if (file_util::PathExists(info.path) && (!IsValid32BitImage(info.path)))
       load_plugin = false;
     break;
   }
   return load_plugin;
 }
 
 }  // namespace npapi
 }  // namespace webkit