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

content/child/npapi/webplugin_delegate_impl_mac.mm

 // 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/webplugin_delegate_impl.h"
+#include "content/child/npapi/webplugin_delegate_impl.h"
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 #include <unistd.h>
 
 #include <set>
 #include <string>
 
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/stats_counters.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/child/npapi/plugin_instance.h"
+#include "content/child/npapi/plugin_lib.h"
+#include "content/child/npapi/plugin_web_event_converter_mac.h"
+#include "content/child/npapi/webplugin.h"
+#include "content/child/npapi/webplugin_accelerated_surface_mac.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "webkit/common/cursors/webcursor.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/npapi/plugin_web_event_converter_mac.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
 
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
+using webkit::WebPluginInfo;
 
 // Important implementation notes: The Mac definition of NPAPI, particularly
 // the distinction between windowed and windowless modes, differs from the
 // Windows and Linux definitions.  Most of those differences are
 // accomodated by the WebPluginDelegate class.
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 namespace {
 
 const int kCoreAnimationRedrawPeriodMs = 10;  // 100 Hz
 
 WebPluginDelegateImpl* g_active_delegate;
 
 // Helper to simplify correct usage of g_active_delegate.  Instantiating will
 // set the active delegate to |delegate| for the lifetime of the object, then
 // NULL when it goes out of scope.
@@ skipping 667 matching lines @@
   [layer_ setFrame:CGRectMake(0, 0,
                               window_rect_.width(), window_rect_.height())];
   [CATransaction commit];
 
   [renderer_ setBounds:[layer_ bounds]];
   surface_->SetSize(window_rect_.size());
   // Kick off the drawing timer, if necessary.
   PluginVisibilityChanged();
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content