4 files changed, 0 insertions, 41 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index fe086f4..9e1bb3f 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -104,10 +104,8 @@ const char* const kHelperFlavorSuffixes[] = {
 const wchar_t kNaClAppName[] = L"nacl64";
 #if defined(GOOGLE_CHROME_BUILD)
 const wchar_t kBrowserAppName[] = L"Chrome";
-const char    kStatsFilename[] = "ChromeStats2";
 #else
 const wchar_t kBrowserAppName[] = L"Chromium";
-const char    kStatsFilename[] = "ChromiumStats2";
 #endif
 
 #if defined(OS_WIN)
@@ -158,9 +156,6 @@ const FilePath::CharType kJumpListIconDirname[] = FPL("JumpListIcons");
 const FilePath::CharType kWebAppDirname[] = FPL("Web Applications");
 const FilePath::CharType kServiceStateFileName[] = FPL("Service State");
 
-const int kStatsMaxThreads = 32;
-const int kStatsMaxCounters = 3000;
-
 // We don't enable record mode in the released product because users could
 // potentially be tricked into running a product in record mode without
 // knowing it.  Enable in debug builds.  Playback mode is allowed always,
diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h
index 3e3acc4..7f196a3 100644
--- a/chrome/common/chrome_constants.h
+++ b/chrome/common/chrome_constants.h
@@ -46,7 +46,6 @@ extern const wchar_t kCrashReportLog[];
 extern const wchar_t kTestingInterfaceDLL[];
 extern const char    kInitialProfile[];
 extern const char    kMultiProfileDirPrefix[];
-extern const char    kStatsFilename[];
 extern const wchar_t kBrowserResourcesDll[];
 extern const wchar_t kNaClAppName[];
 extern const FilePath::CharType kExtensionFileExtension[];
@@ -84,9 +83,6 @@ extern const FilePath::CharType kJumpListIconDirname[];
 extern const FilePath::CharType kWebAppDirname[];
 extern const FilePath::CharType kServiceStateFileName[];
 
-extern const int kStatsMaxThreads;
-extern const int kStatsMaxCounters;
-
 extern const bool kRecordModeEnabled;
 
 // Most sequence numbers are used by a renderer when responding to a browser
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 63aa4f7..9fc6437 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -101,12 +101,6 @@ const char kAutomationReinitializeOnChannelError[] =
 const char kBlockReadingThirdPartyCookies[] =
     "block-reading-third-party-cookies";
 
-// Causes the browser process to throw an assertion on startup.
-const char kBrowserAssertTest[]             = "assert-test";
-
-// Causes the browser process to crash on startup.
-const char kBrowserCrashTest[]              = "crash-test";
-
 // How often (in seconds) to check for updates. Should only be used for
 // testing purposes.
 const char kCheckForUpdateIntervalSec[]     = "check-for-update-interval";
@@ -303,9 +297,6 @@ const char kDisableSanitizedClientSidePhishingDetection[] =
 // Disable site-specific tailoring to compatibility issues in WebKit.
 const char kDisableSiteSpecificQuirks[]     = "disable-site-specific-quirks";
 
-// Disable False Start in SSL and TLS connections.
-const char kDisableSSLFalseStart[]          = "disable-ssl-false-start";
-
 // Disable SSL v3 (usually for testing purposes).
 const char kDisableSSL3[]                   = "disable-ssl3";
 
@@ -441,11 +432,6 @@ 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";
 
-// Enable DNS side checking of certificates. Still experimental, should only
-// be used by developers at the current time.
-const char kEnableDNSCertProvenanceChecking[] =
-     "enable-dns-cert-provenance-checking";
-
 // Enables extension APIs that are in development.
 const char kEnableExperimentalExtensionApis[] =
     "enable-experimental-extension-apis";
@@ -502,9 +488,6 @@ const char kEnableNaCl[]                    = "enable-nacl";
 // Enables debugging via RSP over a socket.
 const char kEnableNaClDebug[]               = "enable-nacl-debug";
 
-// Enables TLS origin bound certificate extension.
-const char kEnableOriginBoundCerts[]  = "enable-origin-bound-certs";
-
 // Enable content settings based on host *and* plug-in.
 const char kEnableResourceContentSettings[] =
     "enable-resource-content-settings";
@@ -524,10 +507,6 @@ const char kEnableShortcutsProvider[]       = "enable-shortcuts-provider";
 
 // On platforms that support it, enable smooth scroll animation.
 const char kEnableSmoothScrolling[]         = "enable-smooth-scrolling";
-
-// Enables TLS cached info extension.
-const char kEnableSSLCachedInfo[]  = "enable-ssl-cached-info";
-
 // Enable OAuth sign-in for sync.
 const char kEnableSyncOAuth[]               = "enable-sync-oauth";
 
@@ -547,10 +526,6 @@ const char kEnableTabGroupsContextMenu[]     = "enable-tab-groups-context-menu";
 // Enable the "synced bookmarks" folder.
 const char kEnableSyncedBookmarksFolder[]   = "enable-synced-bookmarks-folder";
 
-// Enable use of experimental TCP sockets API for sending data in the
-// SYN packet.
-const char kEnableTcpFastOpen[]             = "enable-tcp-fastopen";
-
 // Enables the option to show tabs as a vertical stack down the side of the
 // browser window.
 const char kEnableVerticalTabs[]            = "enable-vertical-tabs";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 997aabe..36b2e53 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -45,8 +45,6 @@ extern const char kAuthServerWhitelist[];
 extern const char kAutomationClientChannelID[];
 extern const char kAutomationReinitializeOnChannelError[];
 extern const char kBlockReadingThirdPartyCookies[];
-extern const char kBrowserAssertTest[];
-extern const char kBrowserCrashTest[];
 extern const char kCheckForUpdateIntervalSec[];
 extern const char kChromeVersion[];
 extern const char kCipherSuiteBlacklist[];
@@ -92,7 +90,6 @@ extern const char kDisableRestoreBackgroundContents[];
 extern const char kDisableSanitizedClientSidePhishingDetection[];
 extern const char kDisableSiteSpecificQuirks[];
 extern const char kDisableSSL3[];
-extern const char kDisableSSLFalseStart[];
 extern const char kDisableSync[];
 extern const char kDisableSyncApps[];
 extern const char kDisableSyncAutofill[];
@@ -129,7 +126,6 @@ extern const char kEnableCloudPrint[];
 extern const char kEnableCompositeToTexture[];
 extern const char kEnableConnectBackupJobs[];
 extern const char kEnableCrxlessWebApps[];
-extern const char kEnableDNSCertProvenanceChecking[];
 extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
@@ -144,21 +140,18 @@ extern const char kEnableMacCookies[];
 extern const char kEnableMemoryInfo[];
 extern const char kEnableNaCl[];
 extern const char kEnableNaClDebug[];
-extern const char kEnableOriginBoundCerts[];
 extern const char kEnablePanels[];
 extern const char kEnablePreconnect[];
 extern const char kEnableResourceContentSettings[];
 extern const char kEnableSearchProviderApiV2[];
 extern const char kEnableShortcutsProvider[];
 extern const char kEnableSmoothScrolling[];
-extern const char kEnableSSLCachedInfo[];
 extern const char kEnableSyncOAuth[];
 extern const char kEnableSyncSearchEngines[];
 extern const char kEnableSyncSessions[];
 extern const char kEnableSyncSessionsForOtherClients[];
 extern const char kEnableSyncedBookmarksFolder[];
 extern const char kEnableTabGroupsContextMenu[];
-extern const char kEnableTcpFastOpen[];
 extern const char kEnableTopSites[];
 extern const char kEnableVerticalTabs[];
 extern const char kEnableWatchdog[];