Move default_plugin from webkit/ to chrome/

Second try, first try at http://codereview.chromium.org/2803035 . Also contains http://codereview.chromium.org/2838044 , changes to DEPS files (mostly cleanups), and a change to webkit/glue/plugins/webplugin_delegate_impl_win.cc .

BUG= 48419
TEST=everything still builds

Review URL: http://codereview.chromium.org/2813047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51692 0039d316-1c4b-4281-b951-d872f2087c98

36 files changed, 82 insertions, 82 deletions

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index ab241c6..1ab9514 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -262,7 +262,7 @@ END
 // We include these resources because all ICON types need to be in the
 // same .rc file.  See:
 // http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111.aspx
-#include "webkit\\default_plugin\\default_plugin_resources.rc"
+#include "chrome\\default_plugin\\default_plugin_resources.rc"
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 5380f75..8625067 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -11,7 +11,6 @@ include_rules = [
   "+sandbox/src",
   "+skia/include",
   "+webkit/database",
-  "+webkit/default_plugin",
   "+webkit/glue",  # Defines some types that are marshalled over IPC.
   "+xib_localizers", # For generated mac localization helpers
 
diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index 4bbe22c..b7f38c5 100644
--- a/chrome/browser/plugin_installer.cc
+++ b/chrome/browser/plugin_installer.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 
 PluginInstaller::PluginInstaller(TabContents* tab_contents)
     : ConfirmInfoBarDelegate(tab_contents),
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 08c643a..8e3830c 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -125,6 +125,7 @@
         'chrome_strings',
         'common_constants',
         'common_net',
+        'default_plugin/default_plugin.gyp:default_plugin',
         'theme_resources',
         '../app/app.gyp:app_base',
         '../app/app.gyp:app_resources',
@@ -141,7 +142,6 @@
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../webkit/default_plugin/default_plugin.gyp:default_plugin',
         '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:glue',
       ],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 16a1037..62cf34a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -295,9 +295,9 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         # run time dependencies
+        'default_plugin/default_plugin.gyp:default_plugin',
         '../third_party/ppapi/ppapi.gyp:ppapi_tests',
         '../webkit/support/webkit_support.gyp:npapi_layout_test_plugin',
-        '../webkit/default_plugin/default_plugin.gyp:default_plugin',
       ],
       'include_dirs': [
         '..',
diff --git a/chrome/common/DEPS b/chrome/common/DEPS
index 75629ca..2f3b9b0 100644
--- a/chrome/common/DEPS
+++ b/chrome/common/DEPS
@@ -1,12 +1,12 @@
 include_rules = [
   "+chrome/plugin",  # For checking whether we're a plugin process.
+  "+chrome/default_plugin",
   "+grit",  # For generated headers
   "+libxml",
   "+media/audio",
   "+remoting/client/plugin",
   "+sandbox/src",
   "+skia/include",
-  "+webkit/default_plugin",
   "+webkit/glue",
 
   # Other libraries.
diff --git a/chrome/common/default_plugin.cc b/chrome/common/default_plugin.cc
index 2dc8488..bba738b 100644
--- a/chrome/common/default_plugin.cc
+++ b/chrome/common/default_plugin.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/common/default_plugin.h"
 
+#include "chrome/default_plugin/plugin_main.h"
 #include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/default_plugin/plugin_main.h"
 
 namespace chrome {
 
diff --git a/webkit/default_plugin/DEPS b/chrome/default_plugin/DEPS
index a24c01b..c004887 100644
--- a/webkit/default_plugin/DEPS
+++ b/chrome/default_plugin/DEPS
@@ -1,4 +1,6 @@
 include_rules = [
   "+app",
+  "+grit",  # For generated headers
   "+third_party/libxml",
+  "+webkit/glue",
 ]
diff --git a/webkit/default_plugin/default_plugin.gyp b/chrome/default_plugin/default_plugin.gyp
index 5339a3d..b2852bf 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/chrome/default_plugin/default_plugin.gyp
@@ -11,22 +11,19 @@
       'target_name': 'default_plugin',
       'type': '<(library)',
       'dependencies': [
-        '../../net/net.gyp:net_resources',
-        '../../third_party/icu/icu.gyp:icui18n',
-        '../../third_party/icu/icu.gyp:icuuc',
-        '../../third_party/libxml/libxml.gyp:libxml',
-        '../../third_party/npapi/npapi.gyp:npapi',
-        '../support/webkit_support.gyp:webkit_resources',
-        '../support/webkit_support.gyp:webkit_strings',
+        '<(DEPTH)/net/net.gyp:net_resources',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
+        '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
       ],
       'include_dirs': [
-        '../..',
+        '<(DEPTH)',
         '<(DEPTH)/third_party/wtl/include',
-        # TODO(bradnelson): this should fall out of the dependencies.
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
       ],
       'sources': [
-        'default_plugin_shared.h',
         'plugin_impl_gtk.cc',
         'plugin_impl_gtk.h',
         'plugin_impl_mac.h',
@@ -54,7 +51,7 @@
          }],
          ['OS=="linux"', {
             'dependencies': [
-              '../../build/linux/system.gyp:gtk',
+              '<(DEPTH)/build/linux/system.gyp:gtk',
             ],
          }],
       ],
diff --git a/webkit/default_plugin/default_plugin_resources.h b/chrome/default_plugin/default_plugin_resources.h
index 6e6942c..6e6942c 100644
--- a/webkit/default_plugin/default_plugin_resources.h
+++ b/chrome/default_plugin/default_plugin_resources.h
diff --git a/webkit/default_plugin/default_plugin_resources.rc b/chrome/default_plugin/default_plugin_resources.rc
index 53460af..53460af 100644
--- a/webkit/default_plugin/default_plugin_resources.rc
+++ b/chrome/default_plugin/default_plugin_resources.rc
diff --git a/webkit/default_plugin/install_dialog.cc b/chrome/default_plugin/install_dialog.cc
index e56c7be..e61001a 100644
--- a/webkit/default_plugin/install_dialog.cc
+++ b/chrome/default_plugin/install_dialog.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/default_plugin/install_dialog.h"
+#include "chrome/default_plugin/install_dialog.h"
 
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "chrome/default_plugin/plugin_impl.h"
 #include "grit/webkit_strings.h"
-#include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
 typedef base::hash_map<const std::wstring, PluginInstallDialog*> DialogMap;
diff --git a/webkit/default_plugin/install_dialog.h b/chrome/default_plugin/install_dialog.h
index e5e5543..0aaf06e 100644
--- a/webkit/default_plugin/install_dialog.h
+++ b/chrome/default_plugin/install_dialog.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_INSTALL_DIALOG_H__
-#define WEBKIT_DEFAULT_PLUGIN_INSTALL_DIALOG_H__
+#ifndef CHROME_DEFAULT_PLUGIN_INSTALL_DIALOG_H_
+#define CHROME_DEFAULT_PLUGIN_INSTALL_DIALOG_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <string>
 #include <vector>
 
-#include "webkit/default_plugin/default_plugin_resources.h"
+#include "chrome/default_plugin/default_plugin_resources.h"
 
 class PluginInstallerImpl;
 
@@ -38,7 +38,7 @@ class PluginInstallDialog : public CDialogImpl<PluginInstallDialog> {
   void ShowInstallDialog(HWND parent);
 
  private:
-  PluginInstallDialog(const std::wstring& plugin_name);
+  explicit PluginInstallDialog(const std::wstring& plugin_name);
   ~PluginInstallDialog();
 
   // Implemented to ensure that we handle RTL layouts correctly.
@@ -57,4 +57,4 @@ class PluginInstallDialog : public CDialogImpl<PluginInstallDialog> {
   std::wstring plugin_name_;
 };
 
-#endif  // WEBKIT_DEFAULT_PLUGIN_INSTALL_DIALOG_H__
+#endif  // CHROME_DEFAULT_PLUGIN_INSTALL_DIALOG_H_
diff --git a/webkit/default_plugin/plugin_database_handler.cc b/chrome/default_plugin/plugin_database_handler.cc
index 3aeff63..ab79752 100644
--- a/webkit/default_plugin/plugin_database_handler.cc
+++ b/chrome/default_plugin/plugin_database_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/default_plugin/plugin_database_handler.h"
+#include "chrome/default_plugin/plugin_database_handler.h"
 
 #if defined(USE_SYSTEM_LIBXML)
 #include <parser.h>
@@ -17,8 +17,8 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "webkit/default_plugin/plugin_impl.h"
-#include "webkit/default_plugin/plugin_main.h"
+#include "chrome/default_plugin/plugin_impl.h"
+#include "chrome/default_plugin/plugin_main.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/webkit/default_plugin/plugin_database_handler.h b/chrome/default_plugin/plugin_database_handler.h
index ae83a28..fcbdfd0 100644
--- a/webkit/default_plugin/plugin_database_handler.h
+++ b/chrome/default_plugin/plugin_database_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H
-#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H
+#ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H_
+#define CHROME_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H_
 
 #include <windows.h>
 #include <string>
@@ -153,4 +153,4 @@ class PluginDatabaseHandler {
   bool ignore_plugin_db_data_;
 };
 
-#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_DATABASE_DOWNLOAD_HANDLER_H
+#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H_
diff --git a/webkit/default_plugin/plugin_impl.h b/chrome/default_plugin/plugin_impl.h
index 723cb05..45e0af3 100644
--- a/webkit/default_plugin/plugin_impl.h
+++ b/chrome/default_plugin/plugin_impl.h
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #if defined(OS_WIN)
-#include "webkit/default_plugin/plugin_impl_win.h"
+#include "chrome/default_plugin/plugin_impl_win.h"
 #elif defined(OS_MACOSX)
-#include "webkit/default_plugin/plugin_impl_mac.h"
+#include "chrome/default_plugin/plugin_impl_mac.h"
 #elif defined(TOOLKIT_USES_GTK)
-#include "webkit/default_plugin/plugin_impl_gtk.h"
+#include "chrome/default_plugin/plugin_impl_gtk.h"
 #endif
diff --git a/webkit/default_plugin/plugin_impl_gtk.cc b/chrome/default_plugin/plugin_impl_gtk.cc
index cfc599a..19b960e 100644
--- a/webkit/default_plugin/plugin_impl_gtk.cc
+++ b/chrome/default_plugin/plugin_impl_gtk.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/default_plugin/plugin_impl_gtk.h"
+#include "chrome/default_plugin/plugin_impl_gtk.h"
 
 #include <gdk/gdkx.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "chrome/default_plugin/plugin_main.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
-#include "webkit/default_plugin/plugin_main.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 
 // TODO(thakis): Most methods in this class are stubbed out an need to be
 // implemented.
diff --git a/webkit/default_plugin/plugin_impl_gtk.h b/chrome/default_plugin/plugin_impl_gtk.h
index 7e2113be..ec63218 100644
--- a/webkit/default_plugin/plugin_impl_gtk.h
+++ b/chrome/default_plugin/plugin_impl_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
-#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
+#ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
+#define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
 
 #include <string>
 #include <vector>
@@ -280,4 +280,4 @@ class PluginInstallerImpl {
   DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
 };
 
-#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
+#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
diff --git a/webkit/default_plugin/plugin_impl_mac.h b/chrome/default_plugin/plugin_impl_mac.h
index dad298e..9e3b7fc 100644
--- a/webkit/default_plugin/plugin_impl_mac.h
+++ b/chrome/default_plugin/plugin_impl_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
-#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
+#ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
+#define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
 
 #include <string>
 #include <vector>
@@ -282,4 +282,4 @@ class PluginInstallerImpl {
 };
 
 
-#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
+#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
diff --git a/webkit/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm
index dd3cac8..253e786 100644
--- a/webkit/default_plugin/plugin_impl_mac.mm
+++ b/chrome/default_plugin/plugin_impl_mac.mm
@@ -1,20 +1,20 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// 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 "webkit/default_plugin/plugin_impl_mac.h"
+#include "chrome/default_plugin/plugin_impl_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "chrome/default_plugin/plugin_main.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
-#include "webkit/default_plugin/plugin_main.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 
 // TODO(thakis): Most methods in this class are stubbed out and need to be
 // implemented.
@@ -161,7 +161,7 @@ int16 PluginInstallerImpl::OnDrawRect(CGContextRef context, CGRect dirty_rect) {
       roundf(text_rect.origin.x + (text_rect.size.width - text_size.width)/2),
       roundf(text_rect.origin.y + (text_rect.size.height - text_size.height)/2));
   [text drawAtPoint:label_point withAttributes:attributes];
-  
+
   [NSGraphicsContext restoreGraphicsState];
   return 1;
 }
diff --git a/webkit/default_plugin/plugin_impl_win.cc b/chrome/default_plugin/plugin_impl_win.cc
index 55b9164..3f0f46e 100644
--- a/webkit/default_plugin/plugin_impl_win.cc
+++ b/chrome/default_plugin/plugin_impl_win.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/default_plugin/plugin_impl_win.h"
+#include "chrome/default_plugin/plugin_impl_win.h"
 
 #include <shellapi.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "chrome/default_plugin/plugin_main.h"
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
-#include "webkit/default_plugin/plugin_main.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 
 static const int TOOLTIP_MAX_WIDTH = 500;
 
@@ -259,7 +259,7 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) {
 
 int16 PluginInstallerImpl::NPP_HandleEvent(void* event) {
   NPEvent* npp_event = static_cast<NPEvent*>(event);
-  if (npp_event->event == kInstallMissingPluginMessage) {
+  if (npp_event->event == default_plugin::kInstallMissingPluginMessage) {
     // We could get this message because InfoBar may not be in sync with our
     // internal processing. So we need to check the status.
     if (plugin_installer_state() == PluginListDownloaded) {
diff --git a/webkit/default_plugin/plugin_impl_win.h b/chrome/default_plugin/plugin_impl_win.h
index f2e9ba8..7add87d 100644
--- a/webkit/default_plugin/plugin_impl_win.h
+++ b/chrome/default_plugin/plugin_impl_win.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
-#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
+#ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
+#define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
 
 #include <string>
 #include <vector>
 
+#include "chrome/default_plugin/install_dialog.h"
+#include "chrome/default_plugin/plugin_database_handler.h"
+#include "chrome/default_plugin/plugin_install_job_monitor.h"
 #include "gfx/window_impl.h"
 #include "third_party/npapi/bindings/npapi.h"
-#include "webkit/default_plugin/install_dialog.h"
-#include "webkit/default_plugin/plugin_database_handler.h"
-#include "webkit/default_plugin/plugin_install_job_monitor.h"
 
 // Possible plugin installer states.
 enum PluginInstallerState {
@@ -37,7 +37,6 @@ class PluginDatabaseHandler;
 class PluginInstallerImpl : public gfx::WindowImpl {
  public:
   static const int kRefreshPluginsMessage  = WM_APP + 1;
-  static const int kInstallMissingPluginMessage = WM_APP + 2;
 
   // mode is the plugin instantiation mode, i.e. whether it is a full
   // page plugin (NP_FULL) or an embedded plugin (NP_EMBED)
@@ -314,4 +313,4 @@ class PluginInstallerImpl : public gfx::WindowImpl {
 };
 
 
-#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
+#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
diff --git a/webkit/default_plugin/plugin_install_job_monitor.cc b/chrome/default_plugin/plugin_install_job_monitor.cc
index 61eba92..d0088eb 100644
--- a/webkit/default_plugin/plugin_install_job_monitor.cc
+++ b/chrome/default_plugin/plugin_install_job_monitor.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/default_plugin/plugin_install_job_monitor.h"
+#include "chrome/default_plugin/plugin_install_job_monitor.h"
 
 #include "base/message_loop.h"
-#include "webkit/default_plugin/plugin_impl.h"
+#include "chrome/default_plugin/plugin_impl.h"
 
 PluginInstallationJobMonitorThread::PluginInstallationJobMonitorThread()
     : Thread("Chrome plugin install thread"),
diff --git a/webkit/default_plugin/plugin_install_job_monitor.h b/chrome/default_plugin/plugin_install_job_monitor.h
index 477df48..271d4eb 100644
--- a/webkit/default_plugin/plugin_install_job_monitor.h
+++ b/chrome/default_plugin/plugin_install_job_monitor.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H__
-#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H__
+#ifndef CHROME_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H_
+#define CHROME_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H_
 
 #include <windows.h>
 
@@ -78,4 +78,4 @@ class PluginInstallationJobMonitorThread :
   DISALLOW_COPY_AND_ASSIGN(PluginInstallationJobMonitorThread);
 };
 
-#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H__
+#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H_
diff --git a/webkit/default_plugin/plugin_main.cc b/chrome/default_plugin/plugin_main.cc
index 16f0f6b..2e5b808 100644
--- a/webkit/default_plugin/plugin_main.cc
+++ b/chrome/default_plugin/plugin_main.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/default_plugin/plugin_main.h"
+#include "chrome/default_plugin/plugin_main.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "webkit/default_plugin/plugin_impl.h"
+#include "chrome/default_plugin/plugin_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace default_plugin {
@@ -158,8 +158,8 @@ bool NegotiateModels(NPP instance) {
   return true;
 }
 
-NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16_t mode, int16_t argc,
-                char* argn[], char* argv[], NPSavedData* saved) {
+NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16_t mode,
+                int16_t argc, char* argn[], char* argv[], NPSavedData* saved) {
   if (instance == NULL)
     return NPERR_INVALID_INSTANCE_ERROR;
 
diff --git a/webkit/default_plugin/plugin_main.h b/chrome/default_plugin/plugin_main.h
index 50f3009..d9dac4e 100644
--- a/webkit/default_plugin/plugin_main.h
+++ b/chrome/default_plugin/plugin_main.h
@@ -13,8 +13,8 @@ namespace default_plugin {
 extern NPNetscapeFuncs* g_browser;
 
 // Standard NPAPI functions.
-NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
-                char* argn[], char* argv[], NPSavedData* saved);
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
+                int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
 NPError NPP_Destroy(NPP instance, NPSavedData** save);
 NPError NPP_SetWindow(NPP instance, NPWindow* window);
 NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
@@ -22,7 +22,7 @@ NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream,
 NPError NPP_DestroyStream(NPP instance, NPStream* stream, NPReason reason);
 int32_t NPP_WriteReady(NPP instance, NPStream* stream);
 int32_t NPP_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
-                void* buffer);
+                  void* buffer);
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 NPError NPP_GetValue(NPP instance, NPPVariable variable, void* value);
 #endif
diff --git a/webkit/default_plugin/plugins.xml b/chrome/default_plugin/plugins.xml
index 8799ca9..8799ca9 100644
--- a/webkit/default_plugin/plugins.xml
+++ b/chrome/default_plugin/plugins.xml
diff --git a/webkit/default_plugin/plugins2.xml b/chrome/default_plugin/plugins2.xml
index 3cddca3..3cddca3 100644
--- a/webkit/default_plugin/plugins2.xml
+++ b/chrome/default_plugin/plugins2.xml
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index e9d601f..b05975c 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -7,7 +7,6 @@ include_rules = [
   "+media/filters",
   "+sandbox/src",
   "+skia/include",
-  "+webkit/default_plugin",
   "+webkit/extensions",
   "+webkit/glue",
   "+webkit/glue/plugins",
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index bb7d877..f05e975 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -111,7 +111,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebWindowFeatures.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
@@ -121,6 +120,7 @@
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/password_form.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 #include "webkit/glue/plugins/pepper_webplugin_impl.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate.h"
diff --git a/webkit/default_plugin/default_plugin_shared.h b/webkit/glue/plugins/default_plugin_shared.h
index 6bc56fb..79d06b3 100644
--- a/webkit/default_plugin/default_plugin_shared.h
+++ b/webkit/glue/plugins/default_plugin_shared.h
@@ -5,8 +5,8 @@
 // Thes file contains stuff that should be shared among projects that do some
 // special handling with default plugin
 
-#ifndef WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
-#define WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
+#ifndef WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
+#define WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
 
 namespace default_plugin {
 
@@ -21,6 +21,11 @@ enum MissingPluginStatus {
   MISSING_PLUGIN_USER_STARTED_DOWNLOAD
 };
 
+#if defined(OS_WIN)
+#include <windows.h>
+const int kInstallMissingPluginMessage = WM_APP + 117;
+#endif
+
 }  // namespace default_plugin
 
-#endif // #ifndef WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
+#endif // WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index f2e4840..fe1d7ef 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -15,8 +15,8 @@
 #include "base/sys_string_conversions.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
-#include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 #include "webkit/glue/plugins/npapi_extension_thunk.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
index 3bcff4c..efa6bdd 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -18,7 +18,6 @@
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
index 6da9333..d822b2e 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc
@@ -18,7 +18,7 @@
 #include "base/win_util.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/default_plugin/plugin_impl.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
@@ -466,7 +466,7 @@ void WebPluginDelegateImpl::Print(HDC hdc) {
 
 void WebPluginDelegateImpl::InstallMissingPlugin() {
   NPEvent evt;
-  evt.event = PluginInstallerImpl::kInstallMissingPluginMessage;
+  evt.event = default_plugin::kInstallMissingPluginMessage;
   evt.lParam = 0;
   evt.wParam = 0;
   instance()->NPP_HandleEvent(&evt);
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index aaa1d3f..cf97f76 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -155,6 +155,7 @@
         'plugins/carbon_plugin_window_tracker_mac.h',
         'plugins/carbon_plugin_window_tracker_mac.cc',
         'plugins/coregraphics_private_symbols_mac.h',
+        'plugins/default_plugin_shared.h',
         'plugins/nphostapi.h',
         'plugins/gtk_plugin_container.h',
         'plugins/gtk_plugin_container.cc',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index b620db8..95e3193 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -159,7 +159,6 @@
           ],
           'dependencies': [
             '<(DEPTH)/breakpad/breakpad.gyp:breakpad_handler',
-            '<(DEPTH)/webkit/default_plugin/default_plugin.gyp:default_plugin',
           ],
           # TODO(bradnelson):
           # This should really be done in the 'npapi_layout_test_plugin'