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

chrome/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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 "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
@@ skipping 39 matching lines @@
     // Create an accelerated view the size of the rhwvmac.
     [rwhv_cocoa_.get() setFrame:NSMakeRect(0, 0, w, h)];
     gfx::PluginWindowHandle accelerated_handle =
         rwhv_mac_->AllocateFakePluginWindowHandle(/*opaque=*/false,
                                                   /*root=*/false);
     rwhv_mac_->AcceleratedSurfaceSetIOSurface(accelerated_handle, w, h, 0);
 
     // The accelerated view isn't shown until it has a valid rect and has been
     // painted to.
     rwhv_mac_->AcceleratedSurfaceBuffersSwapped(accelerated_handle, 0, 0, 0, 0);
-    webkit::npapi::WebPluginGeometry geom;
+    webkit_glue::WebPluginGeometry geom;
     gfx::Rect rect(0, 0, w, h);
     geom.window = accelerated_handle;
     geom.window_rect = rect;
     geom.clip_rect = rect;
     geom.visible = true;
     geom.rects_valid = true;
     rwhv_mac_->MovePluginWindows(
-        std::vector<webkit::npapi::WebPluginGeometry>(1, geom));
+        std::vector<webkit_glue::WebPluginGeometry>(1, geom));
 
     return accelerated_handle;
   }
  private:
   // This class isn't derived from PlatformTest.
   base::mac::ScopedNSAutoreleasePool pool_;
 
   RenderWidgetHostView* old_rwhv_;
 
  protected:
@@ skipping 103 matching lines @@
 
   // A click on the accelerated view should focus the RWHVCocoa.
   std::pair<NSEvent*, NSEvent*> clicks =
       test_event_utils::MouseClickInView(accelerated_view, 1);
   [rwhv_cocoa_.get() mouseDown:clicks.first];
   EXPECT_EQ(rwhv_cocoa_.get(), [window firstResponder]);
 
   // Clean up.
   rwhv_mac_->DestroyFakePluginWindowHandle(accelerated_handle);
 }