5 files changed, 6 insertions, 11 deletions
diff --git a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
index 5ea451a..651b8cd 100644
--- a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -57,11 +57,6 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
     EnableDOMAutomation();
   }
 
-  // From InProcessBrowserTest.
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    command_line->AppendSwitch(switches::kEnableIndexedDatabase);
-  }
-
   GURL testUrl(const FilePath& file_path) {
     const FilePath kTestDir(FILE_PATH_LITERAL("indexeddb"));
     return ui_test_utils::GetTestUrl(kTestDir, file_path);
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 905d8de..5f44e97 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -573,7 +573,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kDisableSharedWorkers,
     switches::kDisableApplicationCache,
     switches::kDisableDeviceOrientation,
-    switches::kEnableIndexedDatabase,
+    switches::kDisableIndexedDatabase,
     switches::kDisableSpeechInput,
     switches::kDisableGeolocation,
     switches::kShowPaintRects,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 077e28a..1417ce9 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -206,6 +206,9 @@ const char kDisableGLSLTranslator[]         = "disable-glsl-translator";
 // Manager can be used to terminate the offending process in this case.
 const char kDisableHangMonitor[]            = "disable-hang-monitor";
 
+// Disable the Indexed Database API.
+const char kDisableIndexedDatabase[]         = "disable-indexed-database";
+
 // Disable the internal Flash Player.
 const char kDisableInternalFlash[]          = "disable-internal-flash";
 
@@ -424,9 +427,6 @@ const char kEnableFileCookies[]             = "enable-file-cookies";
 // Enable the FileSystem API.
 const char kEnableFileSystem[]              = "enable-file-system";
 
-// Enable the Indexed Database API.
-const char kEnableIndexedDatabase[]         = "enable-indexed-database";
-
 // Use the InMemoryURLIndex to back the HistoryURLProvider for autocomplete
 // results.  If not set, defaults to using the InMemoryDatabase.
 const char kEnableInMemoryURLIndex[]        = "enable-in-memory-url-index";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 13692aa..210d421 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -71,6 +71,7 @@ extern const char kDisableGeolocation[];
 extern const char kDisableGLSLTranslator[];
 extern const char kDisableHangMonitor[];
 extern const char kDisableInternalFlash[];
+extern const char kDisableIndexedDatabase[];
 extern const char kDisableIPv6[];
 extern const char kDisableJavaScript[];
 extern const char kDisableJava[];
@@ -133,7 +134,6 @@ extern const char kEnableFileCookies[];
 extern const char kEnableFileSystem[];
 extern const char kEnableGPUPlugin[];
 extern const char kEnableGPURendering[];
-extern const char kEnableIndexedDatabase[];
 extern const char kEnableInMemoryURLIndex[];
 extern const char kEnableIPv6[];
 extern const char kEnableLogging[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 5b1b6c2..595dc9c 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -912,7 +912,7 @@ void RenderThread::EnsureWebKitInitialized() {
       !command_line.HasSwitch(switches::kDisableSessionStorage));
 
   WebRuntimeFeatures::enableIndexedDatabase(
-      command_line.HasSwitch(switches::kEnableIndexedDatabase));
+      !command_line.HasSwitch(switches::kDisableIndexedDatabase));
 
   WebRuntimeFeatures::enableGeolocation(
       !command_line.HasSwitch(switches::kDisableGeolocation));