More stubbing out. With this and the rest of Linux pending, test_shell links.

There doesn't appear to be a WebKit PLATFORM macro for LINUX and, since we're
in the middle of a merge, adding one isn't a great idea either. So I'm using
__linux__ here. Also, several the stubs were very temporary and since stubbing
them required getting their headers to work as well I just aliased them away.

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


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

2 files changed, 19 insertions, 2 deletions

diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index ec3bf02..b00dfda 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -115,7 +115,7 @@ elif env['PLATFORM'] == 'posix':
   input_files.extend([
       'gtk/test_shell.cc',
       'gtk/webwidget_host.cc',
-      'gtk/webview_host.cc'
+      'gtk/webview_host.cc',
   ])
 
 lib = env.ChromeStaticLibrary('test_shell', input_files)
diff --git a/webkit/tools/test_shell/gtk/test_shell.cc b/webkit/tools/test_shell/gtk/test_shell.cc
index 702195f..fcb5d1b 100644
--- a/webkit/tools/test_shell/gtk/test_shell.cc
+++ b/webkit/tools/test_shell/gtk/test_shell.cc
@@ -12,6 +12,7 @@
 #include "net/base/mime_util.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 
 WebPreferences* TestShell::web_prefs_ = NULL;
@@ -21,7 +22,7 @@ WindowList* TestShell::window_list_;
 TestShell::TestShell() {
   // Uncomment this line to get a bunch of linker errors.  This is what we need
   // to fix.
-  //m_webViewHost.reset(WebViewHost::Create(NULL, NULL, *TestShell::web_prefs_));
+  m_webViewHost.reset(WebViewHost::Create(NULL, NULL, *TestShell::web_prefs_));
 }
 
 TestShell::~TestShell() {
@@ -191,4 +192,20 @@ std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
+// The following cookie functions shouldn't live here, but do for now in order
+// to get things linking
+
+std::string GetCookies(const GURL &url, const GURL &policy_url) {
+  return "";
+}
+
+void SetCookie(const GURL &url, const GURL &policy_url, const std::string &cookie) {
+}
+
+
+ResourceLoaderBridge *
+ResourceLoaderBridge::Create(WebFrame*, std::string const &, GURL const&, GURL const&, GURL const&, std::string const&, int, int, ResourceType::Type, bool) {
+  return NULL;
+}
+
 }  // namespace webkit_glue