Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1513)

Unified Diff: webkit/support/platform_support_mac.mm

Issue 3148024: Disabling DRT related initializations in unit-test mode, they... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/support/platform_support_gtk.cc ('k') | webkit/support/platform_support_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/platform_support_mac.mm
===================================================================
--- webkit/support/platform_support_mac.mm (revision 56557)
+++ webkit/support/platform_support_mac.mm (working copy)
@@ -24,7 +24,7 @@
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 @@
#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 =
« no previous file with comments | « webkit/support/platform_support_gtk.cc ('k') | webkit/support/platform_support_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698