Index: webkit/support/webkit_support.cc |
=================================================================== |
--- webkit/support/webkit_support.cc (revision 177172) |
+++ webkit/support/webkit_support.cc (working copy) |
@@ -170,6 +170,7 @@ |
webkit_platform_support_.reset( |
new TestWebKitPlatformSupport(unit_test_mode, |
shadow_platform_delegate)); |
+ WebKit::setIDBFactory(webkit_platform_support_->idbFactory()); |
#if defined(OS_ANDROID) |
// Make sure we have enough decoding resources for layout tests. |
@@ -185,6 +186,13 @@ |
SimpleResourceLoaderBridge::Shutdown(); |
} |
+ void Reset() { |
+#if defined(OS_ANDROID) |
+ media_player_manager_->ReleaseMediaResources(); |
+#endif |
+ WebKit::setIDBFactory(webkit_platform_support_->idbFactory()); |
+ } |
+ |
TestWebKitPlatformSupport* webkit_platform_support() const { |
return webkit_platform_support_.get(); |
} |
@@ -374,6 +382,10 @@ |
logging::CloseLogFile(); |
} |
+void ResetTestEnvironment() { |
+ test_environment->Reset(); |
+} |
+ |
WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport() { |
DCHECK(test_environment); |
return test_environment->webkit_platform_support(); |
@@ -437,12 +449,6 @@ |
return CreateMediaPlayer(frame, url, client, NULL); |
} |
-#if defined(OS_ANDROID) |
-void ReleaseMediaResources() { |
- test_environment->media_player_manager()->ReleaseMediaResources(); |
-} |
-#endif |
- |
WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |