Index: content/shell/shell_main_delegate.cc |
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc |
index 35a9350be74dec5d359d8529ac6e7f3cf34107fa..e8bbacdf37946a7e8faa76d64ba418dfb73fb73d 100644 |
--- a/content/shell/shell_main_delegate.cc |
+++ b/content/shell/shell_main_delegate.cc |
@@ -15,6 +15,7 @@ |
#include "content/shell/shell_content_browser_client.h" |
#include "content/shell/shell_content_renderer_client.h" |
#include "content/shell/shell_switches.h" |
+#include "content/shell/webkit_test_platform_support.h" |
#include "net/cookies/cookie_monster.h" |
#include "net/http/http_stream_factory.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -93,6 +94,11 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { |
switches::kForceCompositingMode); |
//net::HttpStreamFactory::set_ignore_certificate_errors(true); |
net::CookieMonster::EnableFileScheme(); |
+ if (!WebKitTestPlatformInitialize()) { |
+ if (exit_code) |
+ *exit_code = 1; |
+ return true; |
+ } |
} |
SetContentClient(&content_client_); |
return false; |