Merge Chromium at r63472 : Initial merge by git.

Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a

1 files changed, 28 insertions, 23 deletions

diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 14800a5..14e3ae3 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -28,9 +28,6 @@ extern const char kAllowScriptingGallery[];
 extern const char kAlwaysEnableDevTools[];
 extern const char kApp[];
 extern const char kAppId[];
-extern const char kAppLaunchAsPanel[];
-extern const char kAppsDebug[];
-extern const char kAppsPanel[];
 extern const char kAppsGalleryURL[];
 extern const char kAppsNoThrob[];
 extern const char kAuthNegotiateDelegateWhitelist[];
@@ -51,7 +48,6 @@ extern const char kDiagnostics[];
 extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAltWinstation[];
 extern const char kDisableApplicationCache[];
-extern const char kDisableApps[];
 extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundNetworking[];
@@ -66,12 +62,16 @@ extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableDeviceOrientation[];
 extern const char kDisableExperimentalWebGL[];
-extern const char kDisableExtensions[];
 extern const char kDisableExtensionsFileAccessCheck[];
-extern const char kDisableGeolocation[];
+extern const char kDisableExtensions[];
+extern const char kDisableFileSystem[];
 extern const char kDisableGLSLTranslator[];
+extern const char kDisableGeolocation[];
 extern const char kDisableHangMonitor[];
+extern const char kDisableHistoryQuickProvider[];
+extern const char kDisableHistoryURLProvider[];
 extern const char kDisableInternalFlash[];
+extern const char kDisableIndexedDatabase[];
 extern const char kDisableIPv6[];
 extern const char kDisableJavaScript[];
 extern const char kDisableJava[];
@@ -99,8 +99,6 @@ extern const char kDisableSyncExtensions[];
 extern const char kDisableSyncPasswords[];
 extern const char kDisableSyncPreferences[];
 extern const char kDisableSyncThemes[];
-extern const char kDisableSyncTypedUrls[];
-extern const char kDisableSyncSessions[];
 extern const char kDisableTabCloseableStateWatcher[];
 extern const char kDisableTranslate[];
 extern const char kDisableWebResources[];
@@ -110,31 +108,30 @@ extern const char kDiskCacheDir[];
 extern const char kDiskCacheSize[];
 extern const char kDnsLogDetails[];
 extern const char kDnsPrefetchDisable[];
+extern const char kDnsServer[];
 extern const char kDomAutomationController[];
 extern const char kDumpHistogramsOnExit[];
 extern const char kEnableAccelerated2dCanvas[];
 extern const char kEnableAccessibility[];
 extern const char kEnableAeroPeekTabs[];
+extern const char kEnableAppLauncher[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableBackgroundMode[];
 extern const char kEnableBenchmarking[];
-extern const char kEnableRemoting[];
 extern const char kEnableClearServerData[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableCloudPrint[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableContentPrefetch[];
+extern const char kEnableDefaultApps[];
 extern const char kEnableDeviceMotion[];
 extern const char kEnableDNSSECCerts[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 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[];
 extern const char kEnableMatchPreview[];
@@ -143,23 +140,19 @@ extern const char kEnableMonitorProfile[];
 extern const char kEnableNaCl[];
 extern const char kEnableNaClDebug[];
 extern const char kEnableNativeWebWorkers[];
-extern const char kEnableNewPageInfoBubble[];
 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 kEnableSpeechInput[];
+extern const char kEnableSecureInfoBars[];
+extern const char kEnableSnapStart[];
 extern const char kEnableStatsTable[];
 extern const char kEnableSync[];
-extern const char kEnableSyncApps[];
 extern const char kEnableSyncAutofill[];
-extern const char kEnableSyncBookmarks[];
-extern const char kEnableSyncExtensions[];
-extern const char kEnableSyncPasswords[];
 extern const char kEnableSyncPreferences[];
 extern const char kEnableSyncSessions[];
-extern const char kEnableSyncThemes[];
 extern const char kEnableSyncTypedUrls[];
 extern const char kEnableTabbedOptions[];
 extern const char kEnableTopSites[];
@@ -177,9 +170,12 @@ extern const char kExperimentalSpellcheckerFeatures[];
 extern const char kExplicitlyAllowedPorts[];
 extern const char kExtensionProcess[];
 extern const char kExtensionsUpdateFrequency[];
+extern const char kFlagSwitchesBegin[];
+extern const char kFlagSwitchesEnd[];
 extern const char kFeedbackServer[];
 extern const char kFileDescriptorLimit[];
 extern const char kFirstRun[];
+extern const char kForceAppsPromoVisible[];
 extern const char kForceFieldTestNameAndValue[];
 extern const char kForceRendererAccessibility[];
 extern const char kGpuLauncher[];
@@ -202,9 +198,9 @@ extern const char kInternalPepper[];
 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 kLogFilterPrefix[];
 extern const char kLogNetLog[];
 extern const char kLogPluginMessages[];
 extern const char kLoggingLevel[];
@@ -220,10 +216,12 @@ extern const char kNaClLoaderProcess[];
 extern const char kNaClStartupDialog[];
 extern const char kNoDefaultBrowserCheck[];
 extern const char kNoEvents[];
+extern const char kNoExperiments[];
 extern const char kNoFirstRun[];
 extern const char kNoJsRandomness[];
 extern const char kNoProxyServer[];
 extern const char kNoReferrers[];
+extern const char kNoPings[];
 extern const char kNoSandbox[];
 extern const char kNoStartupWindow[];
 extern const char kNotifyCloudPrintTokenExpired[];
@@ -262,7 +260,6 @@ extern const char kRendererProcess[];
 extern const char kRendererStartupDialog[];
 extern const char kRestoreLastSession[];
 extern const char kSafePlugins[];
-extern const char kSafeBrowsingDatabaseStore[];
 extern const char kSbInfoURLPrefix[];
 extern const char kSbMacKeyURLPrefix[];
 extern const char kSbDisableAutoUpdate[];
@@ -272,6 +269,7 @@ extern const char kServiceProcess[];
 extern const char kServiceAccountLsid[];
 extern const char kShowCompositedLayerBorders[];
 extern const char kShowIcons[];
+extern const char kShowInstantOptIn[];
 extern const char kShowPaintRects[];
 extern const char kSilentDumpOnDCHECK[];
 extern const char kSimpleDataSource[];
@@ -300,6 +298,7 @@ extern const char kUninstall[];
 extern const char kUseSpdy[];
 extern const char kIgnoreCertificateErrors[];
 extern const char kMaxSpdySessionsPerDomain[];
+extern const char kUnlimitedQuotaForFiles[];
 extern const char kUseLowFragHeapCrt[];
 extern const char kUserAgent[];
 extern const char kUserDataDir[];
@@ -328,11 +327,18 @@ extern const char kTestLoadLibcros[];
 extern const char kLoginProfile[];
 extern const char kLoginUser[];
 extern const char kLoginPassword[];
+extern const char kParallelAuth[];
 extern const char kChromeosFrame[];
 extern const char kCandidateWindowLang[];
-extern const char kBWSI[];
+extern const char kGuestSession[];
 extern const char kStubCros[];
 extern const char kScreenSaverUrl[];
+extern const char kCompressSystemFeedback[];
+extern const char kForceStubLibcros[];
+extern const char kDisableDOMUIMenu[];
+#ifndef NDEBUG
+extern const char kDOMUIMenuUrl[];
+#endif
 #endif
 
 #if defined(OS_LINUX)
@@ -352,7 +358,6 @@ extern const char kPasswordStore[];
 #endif
 
 #if defined(OS_MACOSX)
-extern const char kDisableFlashCoreAnimation[];
 extern const char kDisableHolePunching[];
 extern const char kEnableExposeForTabs[];
 extern const char kEnableSandboxLogging[];