Consolidate dialog style flags and strings; etc.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 4e32646f9867ea162c086e49a2ebdad3567037bb..21cb53e2b34b51956247db927adae85065a492a8 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -112,7 +112,6 @@
 #include "ppapi/host/ppapi_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_switches.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/plugins/plugin_switches.h"
 
@@ -960,7 +959,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kDumpHistogramsOnExit,
       switches::kEnableBenchmarking,
       switches::kEnableBundledPpapiFlash,
-      switches::kEnableChromeStyleDialogs,
       switches::kEnableCrxlessWebApps,
       switches::kEnableExperimentalExtensionApis,
       switches::kEnableIPCFuzzing,
@@ -969,7 +967,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       switches::kEnableNaClSRPCProxy,
       switches::kEnablePasswordGeneration,
       switches::kEnablePnacl,
-      switches::kEnableTouchDragDrop,
       switches::kEnableWatchdog,
       switches::kMemoryProfiling,
       switches::kMessageLoopHistogrammer,