Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/common/plugin_list_unittest.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 "webkit/plugins/npapi/plugin_list.h"
+#include "content/common/plugin_list.h"
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace webkit {
-namespace npapi {
+using webkit::WebPluginInfo;
+using webkit::WebPluginMimeType;
+
+namespace content {
 
 namespace {
 
 bool Equals(const WebPluginInfo& a, const WebPluginInfo& b) {
   return (a.name == b.name &&
           a.path == b.path &&
           a.version == b.version &&
           a.desc == b.desc);
 }
 
@@ skipping 169 matching lines @@
   PluginList::ExtractVersionString(
       "IcedTea-Web Plugin "
       "(using IcedTea-Web 1.2 (1.2-2ubuntu0.10.04.2))",
       &info);
   EXPECT_EQ(ASCIIToUTF16("1.2"), info.version);
 }
 
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content