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

chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
 #define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
 #pragma once
 
 #include <OpenGL/OpenGL.h>
 #include <map>
 
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "gfx/native_widget_types.h"
 
-namespace webkit_glue {
+namespace webkit {
+namespace npapi {
 struct WebPluginGeometry;
 }
+}
 
 class AcceleratedSurfaceContainerMac;
 
 // Helper class that manages the backing store and on-screen rendering
 // of instances of the GPU plugin on the Mac.
 class AcceleratedSurfaceContainerManagerMac {
  public:
   AcceleratedSurfaceContainerManagerMac();
 
   // Allocates a new "fake" PluginWindowHandle, which is used as the
@@ skipping 26 matching lines @@
                            int32 width,
                            int32 height,
                            uint64 io_surface_identifier);
   void SetSizeAndTransportDIB(gfx::PluginWindowHandle id,
                               int32 width,
                               int32 height,
                               TransportDIB::Handle transport_dib);
 
   // Takes an update from WebKit about a plugin's position and size and moves
   // the plugin accordingly.
-  void SetPluginContainerGeometry(const webkit_glue::WebPluginGeometry& move);
+  void SetPluginContainerGeometry(
+      const webkit::npapi::WebPluginGeometry& move);
 
   // Draws the plugin container associated with the given id into the given
   // OpenGL context, which must already be current.
   void Draw(CGLContextObj context, gfx::PluginWindowHandle id);
 
   // Causes the next Draw call on each container to trigger a texture upload.
   // Should be called any time the drawing context has changed.
   void ForceTextureReload();
 
   // Notifies a surface that it has been painted to.
@@ skipping 36 matching lines @@
   // Both |plugin_window_to_container_map_| and the
   // AcceleratedSurfaceContainerMac in it are not threadsafe, but accessed from
   // multiple threads. All these accesses are guarded by this lock.
   mutable Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_