Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

1 files changed, 29 insertions, 74 deletions

diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 988c2f2..5a2c4e3 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -9,23 +9,24 @@
 #pragma once
 
 #include "build/build_config.h"
+
 #include "base/base_switches.h"
+#include "content/common/content_switches.h"
 
 namespace switches {
 
 // -----------------------------------------------------------------------------
-// Can't find the switch you are looking for? Try looking in
-// base/base_switches.cc instead.
+// Can't find the switch you are looking for? Try looking in app/app_switches.cc
+// or base/base_switches.cc or content/common/content_switches.cc or
+// media/base/media_switches.cc instead.
 // -----------------------------------------------------------------------------
 
 // All switches in alphabetical order. The switches should be documented
 // alongside the definition of their values in the .cc file.
 extern const char kActivateOnLaunch[];
-extern const char kAllowFileAccessFromFiles[];
 extern const char kAllowFileAccess[];
 extern const char kAllowOutdatedPlugins[];
 extern const char kAllowSSLMITMProxies[];
-extern const char kAllowSandboxDebugging[];
 extern const char kAllowScriptingGallery[];
 extern const char kAlwaysAuthorizePlugins[];
 extern const char kAlwaysEnableDevTools[];
@@ -54,9 +55,11 @@ extern const char kConflictingModulesCheck[];
 extern const char kCountry[];
 extern const char kDebugPrint[];
 extern const char kDeviceManagementUrl[];
+extern const char kDevicePolicyCacheDir[];
 extern const char kDiagnostics[];
 extern const char kDisable3DAPIs[];
 extern const char kDisableAcceleratedCompositing[];
+extern const char kDisableAcceleratedLayers[];
 extern const char kDisableAcceleratedVideo[];
 extern const char kDisableAltWinstation[];
 extern const char kDisableApplicationCache[];
@@ -64,8 +67,8 @@ extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundMode[];
 extern const char kDisableBackgroundNetworking[];
-extern const char kDisableBackingStoreLimit[];
 extern const char kDisableBlockContentAnimation[];
+extern const char kDisableConfirmToQuit[];
 extern const char kDisableConnectBackupJobs[];
 extern const char kDisableCustomJumpList[];
 extern const char kDisableDatabases[];
@@ -76,12 +79,10 @@ extern const char kDisableEnforcedThrottling[];
 extern const char kDisableExperimentalWebGL[];
 extern const char kDisableExtensionsFileAccessCheck[];
 extern const char kDisableExtensions[];
-extern const char kDisableFileSystem[];
 extern const char kDisableFlashSandbox[];
 extern const char kDisableGLMultisampling[];
 extern const char kDisableGLSLTranslator[];
 extern const char kDisableGeolocation[];
-extern const char kDisableGpuWatchdog[];
 extern const char kDisableHangMonitor[];
 extern const char kDisableHistoryQuickProvider[];
 extern const char kDisableHistoryURLProvider[];
@@ -92,10 +93,7 @@ extern const char kDisableIPv6[];
 extern const char kDisableJavaScript[];
 extern const char kDisableJava[];
 extern const char kDisableLocalStorage[];
-extern const char kDisableLogging[];
 extern const char kDisableNewTabFirstRun[];
-extern const char kDisablePlugins[];
-extern const char kDisablePopupBlocking[];
 extern const char kDisablePreconnect[];
 extern const char kDisablePromptOnRepost[];
 extern const char kDisableRemoteFonts[];
@@ -112,7 +110,6 @@ extern const char kDisableSyncAutofill[];
 extern const char kDisableSyncAutofillProfile[];
 extern const char kDisableSyncBookmarks[];
 extern const char kDisableSyncExtensions[];
-extern const char kDisableSyncPasswords[];
 extern const char kDisableSyncPreferences[];
 extern const char kDisableSyncThemes[];
 extern const char kDisableTabbedOptions[];
@@ -120,7 +117,6 @@ extern const char kDisableTabCloseableStateWatcher[];
 extern const char kDisableTranslate[];
 extern const char kDisableWebResources[];
 extern const char kDisableWebSecurity[];
-extern const char kDisableWebSockets[];
 extern const char kDisableXSSAuditor[];
 extern const char kDiskCacheDir[];
 extern const char kDiskCacheSize[];
@@ -130,18 +126,17 @@ extern const char kDnsServer[];
 extern const char kDomAutomationController[];
 extern const char kDumpHistogramsOnExit[];
 extern const char kEnableAccelerated2dCanvas[];
-extern const char kEnableAcceleratedLayers[];
 extern const char kEnableAcceleratedPlugins[];
 extern const char kEnableAccessibility[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAuthNegotiatePort[];
-extern const char kEnableBenchmarking[];
 extern const char kEnableClientSidePhishingDetection[];
+extern const char kEnableClientSidePhishingInterstitial[];
 extern const char kEnableClearServerData[];
 extern const char kEnableClickToPlay[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableCloudPrint[];
-extern const char kEnableConfirmToQuit[];
+extern const char kEnableCompositeToTexture[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableCrxlessWebApps[];
 extern const char kEnableDeviceMotion[];
@@ -151,26 +146,21 @@ extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
-extern const char kEnableFileSystemURLScheme[];
-extern const char kEnableGPUPlugin[];
+extern const char kEnableFullScreen[];
+extern const char kEnableHistoryQuickProvider[];
 extern const char kEnableInBrowserThumbnailing[];
 extern const char kEnableIPv6[];
 extern const char kEnableJavaScriptI18NAPI[];
-extern const char kEnableLogging[];
 extern const char kEnableMemoryInfo[];
-extern const char kEnableMonitorProfile[];
 extern const char kEnableNaCl[];
 extern const char kEnableNaClDebug[];
-extern const char kEnableNativeWebWorkers[];
+extern const char kEnableP2PApi[];
 extern const char kEnablePreconnect[];
-extern const char kEnablePreparsedJsCaching[];
 extern const char kEnablePrintPreview[];
 extern const char kEnableRemoting[];
 extern const char kEnableResourceContentSettings[];
 extern const char kEnableSearchProviderApiV2[];
 extern const char kEnableSnapStart[];
-extern const char kEnableSpeechInput[];
-extern const char kEnableStatsTable[];
 extern const char kEnableSync[];
 extern const char kEnableSyncAutofill[];
 extern const char kEnableSyncPreferences[];
@@ -184,10 +174,7 @@ extern const char kEnableVideoFullscreen[];
 extern const char kEnableVideoLogging[];
 extern const char kEnableWatchdog[];
 extern const char kEnableWebAudio[];
-// Experimental features.
-extern const char kExperimentalLocationFeatures[];
 extern const char kExperimentalSpellcheckerFeatures[];
-// End experimental features.
 extern const char kExplicitlyAllowedPorts[];
 extern const char kExtensionProcess[];
 extern const char kExtensionsUpdateFrequency[];
@@ -195,14 +182,12 @@ extern const char kFlagSwitchesBegin[];
 extern const char kFlagSwitchesEnd[];
 extern const char kFeedbackServer[];
 extern const char kFileDescriptorLimit[];
+extern const char kFocusExistingTabOnOpen[];
 extern const char kFirstRun[];
 extern const char kForceAppsPromoVisible[];
 extern const char kForceFieldTestNameAndValue[];
 extern const char kForceRendererAccessibility[];
 extern const char kForceStubLibcros[];
-extern const char kGpuLauncher[];
-extern const char kGpuProcess[];
-extern const char kGpuStartupDialog[];
 extern const char kGSSAPILibraryName[];
 extern const char kHelp[];
 extern const char kHelpShort[];
@@ -223,17 +208,14 @@ extern const char kJavaScriptFlags[];
 extern const char kKeepAliveForTest[];
 extern const char kLoadExtension[];
 extern const char kUninstallExtension[];
-extern const char kLoadPlugin[];
-extern const char kExtraPluginDir[];
 extern const char kLogNetLog[];
-extern const char kLogPluginMessages[];
-extern const char kLoggingLevel[];
 extern const char kMakeDefaultBrowser[];
 extern const char kMediaCacheSize[];
 extern const char kMemoryProfiling[];
 extern const char kMessageLoopHistogrammer[];
 extern const char kMetricsRecordingOnly[];
 extern const char kMinClearSiteDataFlashVersion[];
+extern const char kMultiProfiles[];
 extern const char kNaClDebugIP[];
 extern const char kNaClDebugPorts[];
 extern const char kNaClBrokerProcess[];
@@ -243,12 +225,11 @@ extern const char kNoDefaultBrowserCheck[];
 extern const char kNoEvents[];
 extern const char kNoExperiments[];
 extern const char kNoFirstRun[];
-extern const char kNoGpuSandbox[];
 extern const char kNoJsRandomness[];
 extern const char kNoProxyServer[];
-extern const char kNoReferrers[];
 extern const char kNoPings[];
 extern const char kNoSandbox[];
+extern const char kNoServiceAutorun[];
 extern const char kNoStartupWindow[];
 extern const char kNotifyCloudPrintTokenExpired[];
 extern const char kNumPacThreads[];
@@ -259,23 +240,12 @@ extern const char kPackExtensionKey[];
 extern const char kParentProfile[];
 extern const char kPlaybackMode[];
 extern const char kPluginDataDir[];
-extern const char kPluginLauncher[];
-extern const char kPluginPath[];
-extern const char kPluginProcess[];
-extern const char kPluginStartupDialog[];
-extern const char kPpapiOutOfProcess[];
-extern const char kPpapiPluginLauncher[];
-extern const char kPpapiPluginProcess[];
-extern const char kPpapiStartupDialog[];
 extern const char kPrerender[];
 extern const char kPrerenderSwitchValueAuto[];
 extern const char kPrerenderSwitchValueDisabled[];
 extern const char kPrerenderSwitchValueEnabled[];
 extern const char kPrerenderSwitchValuePrefetchOnly[];
 extern const char kPrint[];
-extern const char kProcessPerSite[];
-extern const char kProcessPerTab[];
-extern const char kProcessType[];
 extern const char kProductVersion[];
 extern const char kProfileImportProcess[];
 extern const char kProfilingAtStart[];
@@ -287,31 +257,27 @@ extern const char kProxyPacUrl[];
 extern const char kProxyServer[];
 extern const char kPurgeMemoryButton[];
 extern const char kRecordMode[];
-extern const char kRegisterPepperPlugins[];
 extern const char kReloadKilledTabs[];
 extern const char kRemoteDebuggingPort[];
 extern const char kRemoteShellPort[];
 extern const char kRendererAssertTest[];
-extern const char kRendererCmdPrefix[];
-extern const char kRendererCrashTest[];
-extern const char kRendererProcess[];
-extern const char kRendererStartupDialog[];
 extern const char kRestoreLastSession[];
-extern const char kSafePlugins[];
 extern const char kSbInfoURLPrefix[];
 extern const char kSbMacKeyURLPrefix[];
 extern const char kSbDisableAutoUpdate[];
 extern const char kSbEnableDownloadProtection[];
+extern const char kSbEnableDownloadWarningUI[];
 extern const char kSdchFilter[];
 extern const char kSearchInOmniboxHint[];
 extern const char kServiceProcess[];
 extern const char kServiceAccountLsid[];
 extern const char kShowCompositedLayerBorders[];
+extern const char kShowCompositedLayerTree[];
+extern const char kShowFPSCounter[];
 extern const char kShowIcons[];
 extern const char kShowPaintRects[];
 extern const char kSilentDumpOnDCHECK[];
 extern const char kSimpleDataSource[];
-extern const char kSingleProcess[];
 extern const char kStartMaximized[];
 extern const char kSyncAllowInsecureXmppConnection[];
 extern const char kSyncInvalidateXmppLogin[];
@@ -320,9 +286,9 @@ extern const char kSyncNotificationMethod[];
 extern const char kSyncNotificationHost[];
 extern const char kSyncServiceURL[];
 extern const char kSyncTrySsltcpFirstForXmpp[];
+extern const char kNewSyncerThread[];
 extern const char kTestNaClSandbox[];
 extern const char kTestName[];
-extern const char kTestSandbox[];
 extern const char kTestType[];
 extern const char kTestingChannelID[];
 extern const char kTrustedPlugins[];
@@ -332,23 +298,13 @@ extern const char kUseSpdy[];
 extern const char kIgnoreCertificateErrors[];
 extern const char kMaxSpdySessionsPerDomain[];
 extern const char kMaxSpdyConcurrentStreams[];
-extern const char kUnlimitedQuotaForFiles[];
-extern const char kUnlimitedQuotaForIndexedDB[];
-extern const char kUseLowFragHeapCrt[];
-extern const char kUserAgent[];
 extern const char kUserDataDir[];
 extern const char kUserScriptsDir[];
 extern const char kUtilityCmdPrefix[];
 extern const char kUtilityProcess[];
 extern const char kUtilityProcessAllowedDir[];
 extern const char kVersion[];
-extern const char kWaitForDebuggerChildren[];
-extern const char kWebWorkerProcessPerCore[];
-extern const char kWebWorkerShareProcesses[];
 extern const char kWinHttpProxyResolver[];
-extern const char kWorkerProcess[];
-extern const char kZygoteCmdPrefix[];
-extern const char kZygoteProcess[];
 
 #if defined(OS_CHROMEOS)
 extern const char kEnableGView[];
@@ -386,15 +342,20 @@ extern const char kUseSystemSSL[];
 #if defined(OS_POSIX)
 extern const char kEnableCrashReporter[];
 extern const char kNoProcessSingletonDialog[];
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
 extern const char kPasswordStore[];
 #endif
 #endif
 
-#if defined(OS_MACOSX)
-extern const char kDisableHolePunching[];
-extern const char kEnableSandboxLogging[];
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
+// Linux, mostly, but also BSDs and such. Password syncing and GNOME Keyring
+// don't play together at the moment so we require explicit opt-in for it.
+extern const char kEnableSyncPasswords[];
 #else
+extern const char kDisableSyncPasswords[];
+#endif
+
+#if !defined(OS_MACOSX)
 extern const char kKioskMode[];
 #endif
 
@@ -417,12 +378,6 @@ extern const char kRendererCheckFalseTest[];
 extern const char kTouchDevices[];
 #endif
 
-extern const char kDisableSeccompSandbox[];
-extern const char kEnableSeccompSandbox[];
-
-// Return true if the switches indicate the seccomp sandbox is enabled.
-bool SeccompSandboxEnabled();
-
 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
 // alphabetical order, or in one of the ifdefs (also in order in each section).