| Index: webkit/support/webkit_support.cc
|
| diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
|
| index 8c8961f85bd175cdeb7f61b2db8672ab0a8fe07c..626e38cf539b2593aa5491badb289fee5946d6d2 100644
|
| --- a/webkit/support/webkit_support.cc
|
| +++ b/webkit/support/webkit_support.cc
|
| @@ -61,7 +61,6 @@
|
| #include "webkit/plugins/webplugininfo.h"
|
| #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
|
| #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
|
| -#include "webkit/support/platform_support.h"
|
| #include "webkit/support/simple_appcache_system.h"
|
| #include "webkit/support/simple_database_system.h"
|
| #include "webkit/support/simple_dom_storage_system.h"
|
| @@ -284,9 +283,7 @@ void SetUpTestEnvironmentForUnitTests() {
|
| // Otherwise crash may happend when different threads try to create a GURL
|
| // at same time.
|
| url_util::Initialize();
|
| - webkit_support::BeforeInitialize();
|
| test_environment = new TestEnvironment;
|
| - webkit_support::AfterInitialize();
|
| webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
|
| "DumpRenderTree/0.0.0.0"), false);
|
| }
|
| @@ -296,13 +293,11 @@ void TearDownTestEnvironment() {
|
| // http://code.google.com/p/chromium/issues/detail?id=9500
|
| base::RunLoop().RunUntilIdle();
|
|
|
| - BeforeShutdown();
|
| if (RunningOnValgrind())
|
| WebKit::WebCache::clear();
|
| WebKit::shutdown();
|
| delete test_environment;
|
| test_environment = NULL;
|
| - AfterShutdown();
|
| logging::CloseLogFile();
|
| }
|
|
|
|
|