Migrate the IndexedDB backend from Blink to Chromium

content/renderer/renderer_webkitplatformsupport_impl.cc

Index: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 133bfc289169c40c11fda7d5a96afeb2ad234c4c..80c8b53f23bd3a3d8567acb622e1c143d3a13004 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -362,8 +362,9 @@ RendererWebKitPlatformSupportImpl::createLocalStorageNamespace(
 
 WebIDBFactory* RendererWebKitPlatformSupportImpl::idbFactory() {
   if (!web_idb_factory_) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
-      web_idb_factory_.reset(WebIDBFactory::create());
+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) &&
+        !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewIndexedDB))
+        web_idb_factory_.reset(WebIDBFactory::create());
     else
       web_idb_factory_.reset(new RendererWebIDBFactoryImpl());
   }