Add runtime enabled command-line flag for data transfer items

BUG=75233
TEST=none

Review URL: http://codereview.chromium.org/6626067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77355 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 9 insertions, 0 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 205a3cf..ce7bfec 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -690,6 +690,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kEnableBenchmarking,
     switches::kEnableClickToPlay,
     switches::kEnableCrxlessWebApps,
+    switches::kEnableDataTransferItems,
     switches::kEnableDCHECK,
     switches::kEnableExperimentalExtensionApis,
     switches::kEnableInBrowserThumbnailing,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index d3023e7..bda4308 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -465,6 +465,9 @@ const char kEnableConnectBackupJobs[]       = "enable-connect-backup-jobs";
 // Enables web developers to create apps for Chrome without using crx packages.
 const char kEnableCrxlessWebApps[]          = "enable-crxless-web-apps";
 
+// Enables data transfer items.
+const char kEnableDataTransferItems[]       = "enable-data-transfer-items";
+
 // Enables device motion events.
 const char kEnableDeviceMotion[]            = "enable-device-motion";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index d4d9b13..4f4e318 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -139,6 +139,7 @@ extern const char kEnableCloudPrint[];
 extern const char kEnableCompositeToTexture[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableCrxlessWebApps[];
+extern const char kEnableDataTransferItems[];
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSCertProvenanceChecking[];
 extern const char kEnableDNSSECCerts[];
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index fbd633d..bfd8b8f 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -953,6 +953,9 @@ void RenderThread::EnsureWebKitInitialized() {
   WebRuntimeFeatures::enableDatabase(
       !command_line.HasSwitch(switches::kDisableDatabases));
 
+  WebRuntimeFeatures::enableDataTransferItems(
+      command_line.HasSwitch(switches::kEnableDataTransferItems));
+
   WebRuntimeFeatures::enableApplicationCache(
       !command_line.HasSwitch(switches::kDisableApplicationCache));
 
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index fd314a4..73c8a41 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -78,6 +78,7 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode)
   WebKit::WebRuntimeFeatures::enableSockets(true);
   WebKit::WebRuntimeFeatures::enableApplicationCache(true);
   WebKit::WebRuntimeFeatures::enableDatabase(true);
+  WebKit::WebRuntimeFeatures::enableDataTransferItems(true);
   WebKit::WebRuntimeFeatures::enableWebGL(true);
   WebKit::WebRuntimeFeatures::enablePushState(true);
   WebKit::WebRuntimeFeatures::enableNotifications(true);