Make TestWebIDBFactory allocate a separate WebIDBFactory per thread.

webkit/support/webkit_support.cc

Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 357c94c59be2151acf92ef5c94bc888b8380941c..4f16414a0d9ee466edf267d120edd805114810b4 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -72,6 +72,7 @@
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/simple_database_system.h"
+#include "webkit/support/test_webidbfactory.h"
 #include "webkit/support/test_webkit_platform_support.h"
 #include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/tools/test_shell/simple_appcache_system.h"
@@ -171,8 +172,8 @@ class TestEnvironment {
         new TestWebKitPlatformSupport(unit_test_mode,
                                       shadow_platform_delegate));
 
-    // TODO(darin): Uncomment this once DRT calls ResetTestEnvironment().
-    //WebKit::setIDBFactory(webkit_platform_support_->idbFactory());
+    idb_factory_.reset(new TestWebIDBFactory());
+    WebKit::setIDBFactory(idb_factory_.get());
 
 #if defined(OS_ANDROID)
     // Make sure we have enough decoding resources for layout tests.
@@ -188,13 +189,6 @@ class TestEnvironment {
     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();
   }
@@ -238,6 +232,7 @@ class TestEnvironment {
   scoped_ptr<base::AtExitManager> at_exit_manager_;
   scoped_ptr<MessageLoopType> main_message_loop_;
   scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
+  scoped_ptr<TestWebIDBFactory> idb_factory_;
 
 #if defined(OS_ANDROID)
   base::FilePath mock_current_directory_;
@@ -397,10 +392,6 @@ void TearDownTestEnvironment() {
   logging::CloseLogFile();
 }
 
-void ResetTestEnvironment() {
-  test_environment->Reset();
-}
-
 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport() {
   DCHECK(test_environment);
   return test_environment->webkit_platform_support();