Integrate the new DomStorage backend into DRT and test_shell.

webkit/tools/test_shell/test_shell_webkit_init.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/tools/test_shell/test_shell_webkit_init.h"
 
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
@@ skipping 239 matching lines @@
     return ASCIIToUTF16("step mismatch");
   return WebKitPlatformSupportImpl::queryLocalizedString(name, value1, value2);
 }
 
 WebKit::WebString TestShellWebKitInit::defaultLocale() {
   return ASCIIToUTF16("en-US");
 }
 
 WebKit::WebStorageNamespace* TestShellWebKitInit::createLocalStorageNamespace(
     const WebKit::WebString& path, unsigned quota) {
+#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
+  return dom_storage_system_.CreateLocalStorageNamespace();
+#else
   // Enforce quota here, ignoring the value from the renderer as in Chrome.
   return WebKit::WebStorageNamespace::createLocalStorageNamespace(
       path,
       WebKit::WebStorageNamespace::m_localStorageQuota);
+#endif
 }
 
 void TestShellWebKitInit::dispatchStorageEvent(
     const WebKit::WebString& key,
     const WebKit::WebString& old_value, const WebKit::WebString& new_value,
     const WebKit::WebString& origin, const WebKit::WebURL& url,
     bool is_local_storage) {
-  // The event is dispatched by the proxy.
+  // All events are dispatched by the WebCore::StorageAreaProxy in the
+  // simple single process case.
+#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
+  NOTREACHED();
+#endif
 }
 
 WebKit::WebIDBFactory* TestShellWebKitInit::idbFactory() {
   return WebKit::WebIDBFactory::create();
 }
 
 void TestShellWebKitInit::createIDBKeysFromSerializedValuesAndKeyPath(
     const WebKit::WebVector<WebKit::WebSerializedScriptValue>& values,
     const WebKit::WebString& keyPath,
     WebKit::WebVector<WebKit::WebIDBKey>& keys_out) {
@@ skipping 52 matching lines @@
     const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
   return SimpleResourceLoaderBridge::Create(request_info);
 }
 
 webkit_glue::WebSocketStreamHandleBridge*
 TestShellWebKitInit::CreateWebSocketBridge(
     WebKit::WebSocketStreamHandle* handle,
     webkit_glue::WebSocketStreamHandleDelegate* delegate) {
   return SimpleSocketStreamBridge::Create(handle, delegate);
 }