database_dispatcher_host changes.

chrome/browser/renderer_host/browser_render_process_host.cc

 // Copyright (c) 2009 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 
 #include "build/build_config.h"
@@ skipping 529 matching lines @@
     switches::kMessageLoopHistogrammer,
     switches::kEnableDCHECK,
     switches::kSilentDumpOnDCHECK,
     switches::kUseLowFragHeapCrt,
     switches::kEnableStatsTable,
     switches::kExperimentalSpellcheckerFeatures,
     switches::kDisableAudio,
     switches::kSimpleDataSource,
     switches::kEnableBenchmarking,
     switches::kInternalNaCl,
-    switches::kEnableDatabases,
     switches::kDisableByteRangeSupport,
     switches::kDisableWebSockets,
     switches::kDisableLocalStorage,
     switches::kEnableSessionStorage,
     switches::kEnableSharedWorkers,
     switches::kEnableDesktopNotifications,
     switches::kEnableApplicationCache,
     // We propagate the Chrome Frame command line here as well in case the
     // renderer is not run in the sandbox.
     switches::kChromeFrame,
 #if defined(OS_MACOSX)
     // Allow this to be set when invoking the browser and relayed along.
     switches::kEnableSandboxLogging,
 #endif
   };
 
+  // Propagate the following switches to the renderer command line (along
+  // with any associated values) only if we're not in incognito mode.
+  static const char* const not_otr_switch_names[] = {
+    switches::kEnableDatabases,
+  };
+
   for (size_t i = 0; i < arraysize(switch_names); ++i) {
     if (browser_cmd.HasSwitch(switch_names[i])) {
       renderer_cmd->AppendSwitchWithValue(switch_names[i],
           browser_cmd.GetSwitchValueASCII(switch_names[i]));
     }
   }
+
+  if (!profile()->IsOffTheRecord()) {
+    for (size_t i = 0; i < arraysize(not_otr_switch_names); ++i) {
+      if (browser_cmd.HasSwitch(not_otr_switch_names[i])) {
+        renderer_cmd->AppendSwitchWithValue(not_otr_switch_names[i],
+            browser_cmd.GetSwitchValueASCII(not_otr_switch_names[i]));
+      }
+    }
+  }
 }
 
 #if defined(OS_WIN)
 
 base::ProcessHandle BrowserRenderProcessHost::ExecuteRenderer(
     CommandLine* cmd_line,
     bool has_cmd_prefix) {
   return sandbox::StartProcess(cmd_line);
 }
 
@@ skipping 541 matching lines @@
     channel_->Send(new ViewMsg_SpellChecker_Init(
         base::FileDescriptor(), std::vector<std::string>(), std::string(),
         false));
   }
 }
 
 void BrowserRenderProcessHost::EnableAutoSpellCorrect(bool enable) {
   channel_->Send(new ViewMsg_SpellChecker_EnableAutoSpellCorrect(enable));
 }
 #endif