Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/renderer/pepper_devices_browsertest.cc

 // Copyright (c) 2010 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 <map>
 #include <vector>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/pepper_devices.h"
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 #include "chrome/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
-#include "webkit/glue/plugins/plugin_instance.h"
-#include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/plugins/webplugin_impl.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/webplugin_impl.h"
 
 class PepperDeviceTest;
 
 namespace {
 
 const char kTestPluginMimeType[] = "chrome-test/pepper-device-test";
 
 // This maps the NPP instances to the test object so our C callbacks can easily
 // get back to the object. There will normally be only one item in this map.
 static std::map<NPP, PepperDeviceTest*> active_tests;
@@ skipping 94 matching lines @@
     NPError err;
     NPUserData* user_data;
   };
   std::vector<FlushData> flush_calls_;
 
  private:
   // testing::Test implementation.
   virtual void SetUp();
   virtual void TearDown();
 
-  NPAPI::PluginVersionInfo version_info_;
+  webkit::npapi::PluginVersionInfo version_info_;
 
-  scoped_ptr<webkit_glue::WebPluginImpl> plugin_;
+  scoped_ptr<webkit::npapi::WebPluginImpl> plugin_;
   WebPluginDelegatePepper* pepper_plugin_;  // FIXME(brettw): check lifetime.
 };
 
 PepperDeviceTest::PepperDeviceTest() {
   version_info_.path = FilePath(FILE_PATH_LITERAL("pepper-device-tester"));
   version_info_.product_name = ASCIIToWide("Pepper device test plugin");
   version_info_.file_description = ASCIIToWide("Pepper device test plugin");
   version_info_.file_version = ASCIIToWide("1");
   version_info_.mime_types = ASCIIToWide(kTestPluginMimeType);
-  NPAPI::PluginEntryPoints entry_points = {
+  webkit::npapi::PluginEntryPoints entry_points = {
 #if !defined(OS_POSIX) || defined(OS_MACOSX)
       NP_GetEntryPoints,
 #endif
       NP_Initialize,
       NP_Shutdown
   };
   version_info_.entry_points = entry_points;
 }
 
 PepperDeviceTest::~PepperDeviceTest() {
 }
 
 void PepperDeviceTest::SetUp() {
   RenderViewTest::SetUp();
 
-  NPAPI::PluginList::Singleton()->RegisterInternalPlugin(version_info_);
+  webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(version_info_);
 
   // Create the WebKit plugin with no delegates (this seems to work
   // sufficiently for the test).
   WebKit::WebPluginParams params;
-  plugin_.reset(new webkit_glue::WebPluginImpl(
+  plugin_.reset(new webkit::npapi::WebPluginImpl(
       NULL, params, FilePath(), std::string(),
-      base::WeakPtr<webkit_glue::WebPluginPageDelegate>()));
+      base::WeakPtr<webkit::npapi::WebPluginPageDelegate>()));
 
   // Create a pepper plugin for the RenderView.
   pepper_plugin_ = WebPluginDelegatePepper::Create(
       plugin_path(), kTestPluginMimeType, view_->AsWeakPtr());
   ASSERT_TRUE(pepper_plugin_);
   ASSERT_TRUE(pepper_plugin_->Initialize(GURL(), std::vector<std::string>(),
                                          std::vector<std::string>(),
                                          plugin_.get(), false));
 
   // Normally the RenderView creates the pepper plugin and registers it with
@@ skipping 10 matching lines @@
   pepper_plugin_->UpdateGeometry(rect, rect);
 }
 
 void PepperDeviceTest::TearDown() {
   active_tests.erase(active_tests.find(npp()));
 
   plugin_.reset();
   if (pepper_plugin_)
     pepper_plugin_->PluginDestroyed();
 
-  NPAPI::PluginList::Singleton()->UnregisterInternalPlugin(version_info_.path);
+  webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(
+      version_info_.path);
 
   RenderViewTest::TearDown();
 }
 
 // static
 void PepperDeviceTest::FlushCalled(NPP instance,
                                    NPDeviceContext* context,
                                    NPError err,
                                    NPUserData* user_data) {
   if (active_tests.find(instance) == active_tests.end())
@@ skipping 56 matching lines @@
   EXPECT_EQ(NPERR_NO_ERROR,
             pepper_plugin()->DeviceAudioInitializeContext(&config, &context));
   EXPECT_TRUE(render_thread_.sink().GetFirstMessageMatching(
       ViewHostMsg_CreateAudioStream::ID));
   EXPECT_EQ(NPERR_NO_ERROR,
             pepper_plugin()->DeviceAudioDestroyContext(&context));
   EXPECT_TRUE(render_thread_.sink().GetFirstMessageMatching(
       ViewHostMsg_CloseAudioStream::ID));
 }