Move webkit/plugins/ppapi to content/renderer/pepper.

content/ppapi_plugin/ppapi_thread.h

 // 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.
 
 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/scoped_native_library.h"
 #include "build/build_config.h"
 #include "content/child/child_thread.h"
+#include "content/public/common/pepper_plugin_info.h"
 #include "ipc/ipc_listener.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/trusted/ppp_broker.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_proxy_delegate.h"
-#include "webkit/plugins/ppapi/plugin_module.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
 #endif
 
 class CommandLine;
 
 namespace base {
 class FilePath;
 }
@@ skipping 96 matching lines @@
   bool is_broker_;
 
   base::ScopedNativeLibrary library_;
 
   ppapi::PpapiPermissions permissions_;
 
   // Global state tracking for the proxy.
   ppapi::proxy::PluginGlobals plugin_globals_;
 
   // Storage for plugin entry points.
-  webkit::ppapi::PluginModule::EntryPoints plugin_entry_points_;
+  PepperPluginInfo::EntryPoints plugin_entry_points_;
 
   // Callback to call when a new instance connects to the broker.
   // Used only when is_broker_.
   PP_ConnectInstance_Func connect_instance_func_;
 
   // Local concept of the module ID. Some functions take this. It's necessary
   // for the in-process PPAPI to handle this properly, but for proxied it's
   // unnecessary. The proxy talking to multiple renderers means that each
   // renderer has a different idea of what the module ID is for this plugin.
   // To force people to "do the right thing" we generate a random module ID
@@ skipping 16 matching lines @@
 #endif
 
   DispatcherMessageListener dispatcher_message_listener_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_