Fix DRT build on Windows.

The main fix is to stub out default_plugin when building upstream.

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

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

4 files changed, 51 insertions, 7 deletions

diff --git a/webkit/support/default_plugin_stubs_win.cc b/webkit/support/default_plugin_stubs_win.cc
new file mode 100644
index 0000000..9f62a0e
--- /dev/null
+++ b/webkit/support/default_plugin_stubs_win.cc
@@ -0,0 +1,29 @@
+// 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.
+
+// These are stubs for default_plugin which isn't current build in
+// a webkit only checkout.
+
+#include "base/logging.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/nphostapi.h"
+
+namespace default_plugin {
+
+NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) {
+  NOTIMPLEMENTED();
+  return NPERR_GENERIC_ERROR;
+}
+
+NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs) {
+  NOTIMPLEMENTED();
+  return NPERR_GENERIC_ERROR;
+}
+
+NPError API_CALL NP_Shutdown(void) {
+  NOTIMPLEMENTED();
+  return NPERR_GENERIC_ERROR;
+}
+
+}  // default_plugin
diff --git a/webkit/support/setup_third_party.gyp b/webkit/support/setup_third_party.gyp
index 3b39db2..986a4ab 100644
--- a/webkit/support/setup_third_party.gyp
+++ b/webkit/support/setup_third_party.gyp
@@ -17,37 +17,37 @@
         {
           'destination': '<(destination)',
           'files': [
-            '<!@(<(list_headers_cmd) <(DEPTH)/public)',
+            '<!@(<(list_headers_cmd) <(DEPTH)/public/)',
           ],
         },
         {
           'destination': '<(destination)/gtk',
           'files': [
-            '<!@(<(list_headers_cmd) <(DEPTH)/public/gtk)',
+            '<!@(<(list_headers_cmd) <(DEPTH)/public/gtk/)',
           ],
         },
         {
           'destination': '<(destination)/linux',
           'files': [
-            '<!@(<(list_headers_cmd) <(DEPTH)/public/linux)',
+            '<!@(<(list_headers_cmd) <(DEPTH)/public/linux/)',
           ],
         },
         {
           'destination': '<(destination)/mac',
           'files': [
-            '<!@(<(list_headers_cmd) <(DEPTH)/public/mac)',
+            '<!@(<(list_headers_cmd) <(DEPTH)/public/mac/)',
           ],
         },
         {
           'destination': '<(destination)/win',
           'files': [
-            '<!@(<(list_headers_cmd) <(DEPTH)/public/win)',
+            '<!@(<(list_headers_cmd) <(DEPTH)/public/win/)',
           ],
         },
         {
           'destination': '<(destination)/x11',
           'files': [
-            '<!@(<(list_headers_cmd) <(DEPTH)/public/x11)',
+            '<!@(<(list_headers_cmd) <(DEPTH)/public/x11/)',
           ],
         },
       ]
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 7092c61..40caa8e 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'chromium_code': 1,
+  },
   'targets': [
     {
       'target_name': 'webkit_support',
@@ -15,6 +18,7 @@
         'glue',
       ],
       'sources': [
+        'default_plugin_stubs_win.cc',
         'platform_support.h',
         'platform_support_gtk.cc',
         'platform_support_mac.mm',
diff --git a/webkit/support/webkit_support_glue.cc b/webkit/support/webkit_support_glue.cc
index d735521..bc4cd0b 100644
--- a/webkit/support/webkit_support_glue.cc
+++ b/webkit/support/webkit_support_glue.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "webkit/glue/webkit_glue.h"
+
+#include "base/base_paths.h"
+#include "base/path_service.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/webkit_glue.h"
 
 // Functions needed by webkit_glue.
 
@@ -25,6 +28,14 @@ bool IsPluginRunningInRendererProcess() {
 void AppendToLog(const char*, int, const char*) {
 }
 
+bool GetApplicationDirectory(FilePath* path) {
+  return PathService::Get(base::DIR_EXE, path);
+}
+
+bool GetExeDirectory(FilePath* path) {
+  return GetApplicationDirectory(path);
+}
+
 bool IsProtocolSupportedForMedia(const GURL& url) {
   if (url.SchemeIsFile() ||
       url.SchemeIs("http") ||