Disabling DRT related initializations in unit-test mode.

WebKit unit-tests using webkit_support fail with these initializations as the test executable doesn't have any packages.

BUG=None
TEST=None

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

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

5 files changed, 17 insertions, 12 deletions

diff --git a/webkit/support/platform_support.h b/webkit/support/platform_support.h
index 73ab950..eb80e82 100644
--- a/webkit/support/platform_support.h
+++ b/webkit/support/platform_support.h
@@ -7,10 +7,10 @@
 
 namespace webkit_support {
 // Called before WebKit::initialize().
-void BeforeInitialize();
+void BeforeInitialize(bool unit_test_mode);
 
 // Called after WebKit::initialize().
-void AfterInitialize();
+void AfterInitialize(bool unit_test_mode);
 
 // Called before WebKit::shutdown().
 void BeforeShutdown();
diff --git a/webkit/support/platform_support_gtk.cc b/webkit/support/platform_support_gtk.cc
index e9d5dff..f9f177f 100644
--- a/webkit/support/platform_support_gtk.cc
+++ b/webkit/support/platform_support_gtk.cc
@@ -25,10 +25,12 @@ namespace webkit_support {
 // TODO(tkent): Implement some of the followings for platform-dependent tasks
 // such as loading resource.
 
-void BeforeInitialize() {
+void BeforeInitialize(bool unit_test_mode) {
 }
 
-void AfterInitialize() {
+void AfterInitialize(bool unit_test_mode) {
+  if (unit_test_mode)
+    return;  // We don't have a resource pack when running the unit-tests.
   g_resource_data_pack = new base::DataPack;
   FilePath data_path;
   PathService::Get(base::DIR_EXE, &data_path);
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 305adbf..a0e426c 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -24,7 +24,7 @@ namespace webkit_support {
 
 static NSAutoreleasePool* autorelease_pool;
 
-void BeforeInitialize() {
+void BeforeInitialize(bool unit_test_mode) {
   // Need to initialize NSAutoreleasePool before InitWebCoreSystemInterface().
   autorelease_pool = [[NSAutoreleasePool alloc] init];
   DCHECK(autorelease_pool);
@@ -93,7 +93,10 @@ static void SwizzleNSPasteboard() {
 #endif
 }
 
-void AfterInitialize() {
+void AfterInitialize(bool unit_test_mode) {
+  if (unit_test_mode)
+    return;  // We don't have a resource pack when running the unit-tests.
+
   // Load a data pack.
   g_resource_data_pack = new base::DataPack;
   NSString* resource_path =
diff --git a/webkit/support/platform_support_win.cc b/webkit/support/platform_support_win.cc
index d5be3c4..0c776b2 100644
--- a/webkit/support/platform_support_win.cc
+++ b/webkit/support/platform_support_win.cc
@@ -46,10 +46,10 @@ namespace webkit_support {
 // TODO(tkent): Implement some of the followings for platform-dependent tasks
 // such as loading resource.
 
-void BeforeInitialize() {
+void BeforeInitialize(bool unit_test_mode) {
 }
 
-void AfterInitialize() {
+void AfterInitialize(bool unit_test_mode) {
 }
 
 void BeforeShutdown() {
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 6d0e5b8..fd55d23 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -113,7 +113,7 @@ class TestEnvironment {
     SimpleResourceLoaderBridge::Shutdown();
   }
 
-  TestWebKitClient* webkit_client() { return webkit_client_.get(); }
+  TestWebKitClient* webkit_client() const { return webkit_client_.get(); }
 
 #if defined(OS_WIN)
   void set_theme_engine(WebKit::WebThemeEngine* engine) {
@@ -121,7 +121,7 @@ class TestEnvironment {
     webkit_client_->SetThemeEngine(engine);
   }
 
-  WebKit::WebThemeEngine* theme_engine() {
+  WebKit::WebThemeEngine* theme_engine() const {
     return webkit_client_->themeEngine();
   }
 #endif
@@ -181,9 +181,9 @@ static void SetUpTestEnvironmentImpl(bool unit_test_mode) {
   const char* kFixedArguments[] = {"DumpRenderTree"};
   CommandLine::Init(arraysize(kFixedArguments), kFixedArguments);
 
-  webkit_support::BeforeInitialize();
+  webkit_support::BeforeInitialize(unit_test_mode);
   webkit_support::test_environment = new TestEnvironment(unit_test_mode);
-  webkit_support::AfterInitialize();
+  webkit_support::AfterInitialize(unit_test_mode);
   if (!unit_test_mode) {
     // Load ICU data tables.  This has to run after TestEnvironment is created
     // because on Linux, we need base::AtExitManager.