Remove webkit/plugins/npapi.

chrome/browser/plugins/plugin_metadata.cc

 // 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 "chrome/browser/plugins/plugin_metadata.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/webplugininfo.h"
 
 // static
 const char PluginMetadata::kAdobeReaderGroupName[] = "Adobe Reader";
 const char PluginMetadata::kJavaGroupName[] = "Java(TM)";
 const char PluginMetadata::kQuickTimeGroupName[] = "QuickTime Player";
 const char PluginMetadata::kShockwaveGroupName[] = "Adobe Shockwave Player";
 const char PluginMetadata::kRealPlayerGroupName[] = "RealPlayer";
 const char PluginMetadata::kSilverlightGroupName[] = "Silverlight";
 const char PluginMetadata::kWindowsMediaPlayerGroupName[] =
@@ skipping 74 matching lines @@
   if (versions_.empty()) {
 #if defined(OS_LINUX)
     // On Linux, unknown plugins require authorization.
     return SECURITY_STATUS_REQUIRES_AUTHORIZATION;
 #else
     return SECURITY_STATUS_UP_TO_DATE;
 #endif
   }
 
   Version version;
-  webkit::npapi::CreateVersionFromString(plugin.version, &version);
+  webkit::WebPluginInfo::CreateVersionFromString(plugin.version, &version);
   if (!version.IsValid())
     version = Version("0");
 
   // |lower_bound| returns the latest version that is not newer than |version|.
   std::map<Version, SecurityStatus, VersionComparator>::const_iterator it =
       versions_.lower_bound(version);
   // If there is at least one version defined, everything older than the oldest
   // defined version is considered out-of-date.
   if (it == versions_.end())
     return SECURITY_STATUS_OUT_OF_DATE;
@@ skipping 11 matching lines @@
   PluginMetadata* copy = new PluginMetadata(identifier_,
                                             name_,
                                             url_for_display_,
                                             plugin_url_,
                                             help_url_,
                                             group_name_matcher_,
                                             language_);
   copy->versions_ = versions_;
   return make_scoped_ptr(copy);
 }