Revert 137733 - Use a temp data dir for IDB tests so persistence can be verified.

webkit/support/test_webkit_platform_support.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/support/test_webkit_platform_support.h"
 
 #include "base/file_util.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 103 matching lines @@
   // A new empty temp directory is created to house any cached
   // content during the run. Upon exit that directory is deleted.
   // If we can't create a tempdir, we'll use in-memory storage.
   if (!appcache_dir_.CreateUniqueTempDir()) {
     LOG(WARNING) << "Failed to create a temp dir for the appcache, "
                     "using in-memory storage.";
     DCHECK(appcache_dir_.path().empty());
   }
   SimpleAppCacheSystem::InitializeOnUIThread(appcache_dir_.path());
 
-  // Create a new temp directory for Indexed DB storage. If this
-  // fails, WebKit uses in-memory storage.
-  if (!indexed_db_dir_.CreateUniqueTempDir()) {
-    LOG(WARNING) << "Failed to create a temp dir for Indexed DB, "
-                    "using in-memory storage.";
-    DCHECK(indexed_db_dir_.path().empty());
-  }
-
   WebKit::WebDatabase::setObserver(&database_system_);
 
   blob_registry_ = new TestShellWebBlobRegistryImpl();
 
   file_utilities_.set_sandbox_enabled(false);
 
   if (!file_system_root_.CreateUniqueTempDir()) {
     LOG(WARNING) << "Failed to create a temp dir for the filesystem."
                     "FileSystem feature will be disabled.";
     DCHECK(file_system_root_.path().empty());
@@ skipping 183 matching lines @@
 WebKit::WebString TestWebKitPlatformSupport::defaultLocale() {
   return ASCIIToUTF16("en-US");
 }
 
 WebKit::WebStorageNamespace*
 TestWebKitPlatformSupport::createLocalStorageNamespace(
     const WebKit::WebString& path, unsigned quota) {
   return dom_storage_system_.CreateLocalStorageNamespace();
 }
 
-// Wrap a WebKit::WebIDBFactory to rewrite the data directory to
-// a scoped temp directory. In multiprocess Chromium this is rewritten
-// to a real profile directory during IPC.
-class TestWebIDBFactory : public WebKit::WebIDBFactory {
- public:
-  TestWebIDBFactory(WebString data_dir)
-      : data_dir_(data_dir)
-      , factory_(WebKit::WebIDBFactory::create()) { }
-
-  virtual void getDatabaseNames(WebKit::WebIDBCallbacks* callbacks,
-                                const WebKit::WebSecurityOrigin& origin,
-                                WebKit::WebFrame* frame,
-                                const WebString& dataDir) {
-    factory_->getDatabaseNames(callbacks, origin, frame,
-                               dataDir.isEmpty() ? data_dir_ : dataDir);
-  }
-
-  virtual void open(const WebString& name,
-                    WebKit::WebIDBCallbacks* callbacks,
-                    const WebKit::WebSecurityOrigin& origin,
-                    WebKit::WebFrame* frame,
-                    const WebString& dataDir) {
-    factory_->open(name, callbacks, origin, frame,
-                   dataDir.isEmpty() ? data_dir_ : dataDir);
-  }
-
-  virtual void deleteDatabase(const WebString& name,
-                              WebKit::WebIDBCallbacks* callbacks,
-                              const WebKit::WebSecurityOrigin& origin,
-                              WebKit::WebFrame* frame,
-                              const WebString& dataDir) {
-    factory_->deleteDatabase(name, callbacks, origin, frame,
-                             dataDir.isEmpty() ? data_dir_ : dataDir);
-  }
- private:
-  WebString data_dir_;
-  scoped_ptr<WebIDBFactory> factory_;
-};
-
 WebKit::WebIDBFactory* TestWebKitPlatformSupport::idbFactory() {
-  WebString path = WebString::fromUTF8(indexed_db_dir_.path().AsUTF8Unsafe());
-  return new TestWebIDBFactory(path);
+  return WebKit::WebIDBFactory::create();
 }
 
 void TestWebKitPlatformSupport::createIDBKeysFromSerializedValuesAndKeyPath(
       const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
       const WebKit::WebIDBKeyPath& keyPath,
       WebKit::WebVector<WebKit::WebIDBKey>& keys_out) {
   WebKit::WebVector<WebKit::WebIDBKey> keys(values.size());
   for (size_t i = 0; i < values.size(); ++i) {
     keys[i] = WebKit::WebIDBKey::createFromValueAndKeyPath(
         values[i], keyPath);
@@ skipping 102 matching lines @@
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return SimpleResourceLoaderBridge::Create(request_info);
 }
 
 webkit_glue::WebSocketStreamHandleBridge*
 TestWebKitPlatformSupport::CreateWebSocketBridge(
     WebKit::WebSocketStreamHandle* handle,
     webkit_glue::WebSocketStreamHandleDelegate* delegate) {
   return SimpleSocketStreamBridge::Create(handle, delegate);
 }