Revert 51681 - Move default_plugin out of webkit.

BUG=48419

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

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2819043

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

32 files changed, 69 insertions, 65 deletions

diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index b7f38c5..4bbe22c 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/glue/plugins/default_plugin_shared.h"
+#include "webkit/default_plugin/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 8e3830c..08c643a 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -125,7 +125,6 @@
         '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',
@@ -142,6 +141,7 @@
         '../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 62cf34a..16a1037 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 2f3b9b0..75629ca 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 bba738b..2dc8488 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/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index f05e975..bb7d877 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -111,6 +111,7 @@
 #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"
@@ -120,7 +121,6 @@
 #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/chrome/default_plugin/DEPS b/webkit/default_plugin/DEPS
index a24c01b..a24c01b 100644
--- a/chrome/default_plugin/DEPS
+++ b/webkit/default_plugin/DEPS
diff --git a/chrome/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index b2852bf..5339a3d 100644
--- a/chrome/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -11,19 +11,22 @@
       'target_name': 'default_plugin',
       'type': '<(library)',
       'dependencies': [
-        '<(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',
+        '../../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',
       ],
       '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',
@@ -51,7 +54,7 @@
          }],
          ['OS=="linux"', {
             'dependencies': [
-              '<(DEPTH)/build/linux/system.gyp:gtk',
+              '../../build/linux/system.gyp:gtk',
             ],
          }],
       ],
diff --git a/chrome/default_plugin/default_plugin_resources.h b/webkit/default_plugin/default_plugin_resources.h
index 6e6942c..6e6942c 100644
--- a/chrome/default_plugin/default_plugin_resources.h
+++ b/webkit/default_plugin/default_plugin_resources.h
diff --git a/chrome/default_plugin/default_plugin_resources.rc b/webkit/default_plugin/default_plugin_resources.rc
index 53460af..53460af 100644
--- a/chrome/default_plugin/default_plugin_resources.rc
+++ b/webkit/default_plugin/default_plugin_resources.rc
diff --git a/webkit/glue/plugins/default_plugin_shared.h b/webkit/default_plugin/default_plugin_shared.h
index 99aac72..6bc56fb 100644
--- a/webkit/glue/plugins/default_plugin_shared.h
+++ b/webkit/default_plugin/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_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
-#define WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
+#ifndef WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
+#define WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
 
 namespace default_plugin {
 
@@ -23,4 +23,4 @@ enum MissingPluginStatus {
 
 }  // namespace default_plugin
 
-#endif // WEBKIT_GLUE_PLUGINS_DEFAULT_PLUGIN_SHARED_H
+#endif // #ifndef WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
diff --git a/chrome/default_plugin/install_dialog.cc b/webkit/default_plugin/install_dialog.cc
index e61001a..e56c7be 100644
--- a/chrome/default_plugin/install_dialog.cc
+++ b/webkit/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 "chrome/default_plugin/install_dialog.h"
+#include "webkit/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/chrome/default_plugin/install_dialog.h b/webkit/default_plugin/install_dialog.h
index 601127dd..e5e5543 100644
--- a/chrome/default_plugin/install_dialog.h
+++ b/webkit/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 CHROME_DEFAULT_PLUGIN_INSTALL_DIALOG_H_
-#define CHROME_DEFAULT_PLUGIN_INSTALL_DIALOG_H_
+#ifndef WEBKIT_DEFAULT_PLUGIN_INSTALL_DIALOG_H__
+#define WEBKIT_DEFAULT_PLUGIN_INSTALL_DIALOG_H__
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <string>
 #include <vector>
 
-#include "chrome/default_plugin/default_plugin_resources.h"
+#include "webkit/default_plugin/default_plugin_resources.h"
 
 class PluginInstallerImpl;
 
@@ -57,4 +57,4 @@ class PluginInstallDialog : public CDialogImpl<PluginInstallDialog> {
   std::wstring plugin_name_;
 };
 
-#endif  // CHROME_DEFAULT_PLUGIN_INSTALL_DIALOG_H_
+#endif  // WEBKIT_DEFAULT_PLUGIN_INSTALL_DIALOG_H__
diff --git a/chrome/default_plugin/plugin_database_handler.cc b/webkit/default_plugin/plugin_database_handler.cc
index ab79752..3aeff63 100644
--- a/chrome/default_plugin/plugin_database_handler.cc
+++ b/webkit/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 "chrome/default_plugin/plugin_database_handler.h"
+#include "webkit/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 "chrome/default_plugin/plugin_impl.h"
-#include "chrome/default_plugin/plugin_main.h"
+#include "webkit/default_plugin/plugin_impl.h"
+#include "webkit/default_plugin/plugin_main.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/default_plugin/plugin_database_handler.h b/webkit/default_plugin/plugin_database_handler.h
index fcbdfd0..ae83a28 100644
--- a/chrome/default_plugin/plugin_database_handler.h
+++ b/webkit/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 CHROME_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H_
-#define CHROME_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H_
+#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H
+#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H
 
 #include <windows.h>
 #include <string>
@@ -153,4 +153,4 @@ class PluginDatabaseHandler {
   bool ignore_plugin_db_data_;
 };
 
-#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_DATABASE_HANDLER_H_
+#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_DATABASE_DOWNLOAD_HANDLER_H
diff --git a/chrome/default_plugin/plugin_impl.h b/webkit/default_plugin/plugin_impl.h
index 45e0af3..723cb05 100644
--- a/chrome/default_plugin/plugin_impl.h
+++ b/webkit/default_plugin/plugin_impl.h
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #if defined(OS_WIN)
-#include "chrome/default_plugin/plugin_impl_win.h"
+#include "webkit/default_plugin/plugin_impl_win.h"
 #elif defined(OS_MACOSX)
-#include "chrome/default_plugin/plugin_impl_mac.h"
+#include "webkit/default_plugin/plugin_impl_mac.h"
 #elif defined(TOOLKIT_USES_GTK)
-#include "chrome/default_plugin/plugin_impl_gtk.h"
+#include "webkit/default_plugin/plugin_impl_gtk.h"
 #endif
diff --git a/chrome/default_plugin/plugin_impl_gtk.cc b/webkit/default_plugin/plugin_impl_gtk.cc
index 19b960e..cfc599a 100644
--- a/chrome/default_plugin/plugin_impl_gtk.cc
+++ b/webkit/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 "chrome/default_plugin/plugin_impl_gtk.h"
+#include "webkit/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/chrome/default_plugin/plugin_impl_gtk.h b/webkit/default_plugin/plugin_impl_gtk.h
index ec63218..7e2113be 100644
--- a/chrome/default_plugin/plugin_impl_gtk.h
+++ b/webkit/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 CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
-#define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
+#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
+#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
 
 #include <string>
 #include <vector>
@@ -280,4 +280,4 @@ class PluginInstallerImpl {
   DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
 };
 
-#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
+#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_GTK_H_
diff --git a/chrome/default_plugin/plugin_impl_mac.h b/webkit/default_plugin/plugin_impl_mac.h
index 9e3b7fc..dad298e 100644
--- a/chrome/default_plugin/plugin_impl_mac.h
+++ b/webkit/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 CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
-#define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
+#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
+#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
 
 #include <string>
 #include <vector>
@@ -282,4 +282,4 @@ class PluginInstallerImpl {
 };
 
 
-#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
+#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_MAC_H_
diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/webkit/default_plugin/plugin_impl_mac.mm
index 253e786..dd3cac8 100644
--- a/chrome/default_plugin/plugin_impl_mac.mm
+++ b/webkit/default_plugin/plugin_impl_mac.mm
@@ -1,20 +1,20 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 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/default_plugin/plugin_impl_mac.h"
+#include "webkit/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/chrome/default_plugin/plugin_impl_win.cc b/webkit/default_plugin/plugin_impl_win.cc
index 4b8dacb..55b9164 100644
--- a/chrome/default_plugin/plugin_impl_win.cc
+++ b/webkit/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 "chrome/default_plugin/plugin_impl_win.h"
+#include "webkit/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;
 
diff --git a/chrome/default_plugin/plugin_impl_win.h b/webkit/default_plugin/plugin_impl_win.h
index 24d1b22..f2e9ba8 100644
--- a/chrome/default_plugin/plugin_impl_win.h
+++ b/webkit/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 CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
-#define CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
+#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
+#define WEBKIT_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 {
@@ -314,4 +314,4 @@ class PluginInstallerImpl : public gfx::WindowImpl {
 };
 
 
-#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
+#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
diff --git a/chrome/default_plugin/plugin_install_job_monitor.cc b/webkit/default_plugin/plugin_install_job_monitor.cc
index d0088eb..61eba92 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.cc
+++ b/webkit/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 "chrome/default_plugin/plugin_install_job_monitor.h"
+#include "webkit/default_plugin/plugin_install_job_monitor.h"
 
 #include "base/message_loop.h"
-#include "chrome/default_plugin/plugin_impl.h"
+#include "webkit/default_plugin/plugin_impl.h"
 
 PluginInstallationJobMonitorThread::PluginInstallationJobMonitorThread()
     : Thread("Chrome plugin install thread"),
diff --git a/chrome/default_plugin/plugin_install_job_monitor.h b/webkit/default_plugin/plugin_install_job_monitor.h
index 271d4eb..477df48 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.h
+++ b/webkit/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 CHROME_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H_
-#define CHROME_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H_
+#ifndef WEBKIT_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H__
+#define WEBKIT_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H__
 
 #include <windows.h>
 
@@ -78,4 +78,4 @@ class PluginInstallationJobMonitorThread :
   DISALLOW_COPY_AND_ASSIGN(PluginInstallationJobMonitorThread);
 };
 
-#endif  // CHROME_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H_
+#endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_INSTALL_JOB_MONITOR_H__
diff --git a/chrome/default_plugin/plugin_main.cc b/webkit/default_plugin/plugin_main.cc
index faf6c82..16f0f6b 100644
--- a/chrome/default_plugin/plugin_main.cc
+++ b/webkit/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 "chrome/default_plugin/plugin_main.h"
+#include "webkit/default_plugin/plugin_main.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "chrome/default_plugin/plugin_impl.h"
+#include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace default_plugin {
diff --git a/chrome/default_plugin/plugin_main.h b/webkit/default_plugin/plugin_main.h
index 50f3009..50f3009 100644
--- a/chrome/default_plugin/plugin_main.h
+++ b/webkit/default_plugin/plugin_main.h
diff --git a/chrome/default_plugin/plugins.xml b/webkit/default_plugin/plugins.xml
index 8799ca9..8799ca9 100644
--- a/chrome/default_plugin/plugins.xml
+++ b/webkit/default_plugin/plugins.xml
diff --git a/chrome/default_plugin/plugins2.xml b/webkit/default_plugin/plugins2.xml
index 3cddca3..3cddca3 100644
--- a/chrome/default_plugin/plugins2.xml
+++ b/webkit/default_plugin/plugins2.xml
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index fe1d7ef..f2e4840 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 efa6bdd..3bcff4c 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
+++ b/webkit/glue/plugins/webplugin_delegate_impl_mac.mm
@@ -18,6 +18,7 @@
 #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/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index cf97f76..aaa1d3f 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -155,7 +155,6 @@
         '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 95e3193..b620db8 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -159,6 +159,7 @@
           ],
           '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'