Partially componentize chrome/common/crash_keys.

chrome/common/crash_keys.h

Index: chrome/common/crash_keys.h
diff --git a/chrome/common/crash_keys.h b/chrome/common/crash_keys.h
index 8f202294cc0ab75807ea4ce03b33578048ef6e3f..acf3cbe81a0aaded276260f35a5f932900ad4bd8 100644
--- a/chrome/common/crash_keys.h
+++ b/chrome/common/crash_keys.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/debug/crash_logging.h"
+#include "components/crash_keys/crash_keys.h"
 
 namespace base {
 class CommandLine;
@@ -21,18 +22,9 @@ namespace crash_keys {
 // reporting server. Returns the size of the union of all keys.
 size_t RegisterChromeCrashKeys();
 
-// Sets the ID (which may either be a full GUID or a GUID that was already
-// stripped from its dashes -- in either case this method will strip remaining
-// dashes before setting the crash key).
-void SetMetricsClientIdFromGUID(const std::string& metrics_client_guid);
-void ClearMetricsClientId();
-
 // Sets the kSwitch and kNumSwitches keys based on the given |command_line|.
 void SetSwitchesFromCommandLine(const base::CommandLine* command_line);
 
-// Sets the list of active experiment/variations info.
-void SetVariationsList(const std::vector<std::string>& variations);
-
 // Sets the list of "active" extensions in this process. We overload "active" to
 // mean different things depending on the process type:
 // - browser: all enabled extensions
@@ -54,21 +46,6 @@ class ScopedPrinterInfo {
 
 // Crash Key Name Constants ////////////////////////////////////////////////////
 
-// The GUID used to identify this client to the crash system.
-#if defined(OS_MACOSX)
-// On Mac OS X, the crash reporting client ID is the responsibility of Crashpad.
-// It is not set directly by Chrome. To make the metrics client ID available on
-// the server, it's stored in a distinct key.
-extern const char kMetricsClientID[];
-#else
-// When using Breakpad instead of Crashpad, the crash reporting client ID is the
-// same as the metrics client ID.
-extern const char kClientID[];
-#endif
-
-// The product release/distribution channel.
-extern const char kChannel[];
-
 // The URL of the active tab.
 extern const char kActiveURL[];
 
@@ -80,12 +57,6 @@ extern const char kSwitch[];
 // |kSwitchesMaxCount| are present.
 extern const char kNumSwitches[];
 
-// The total number of experiments the instance has.
-extern const char kNumVariations[];
-// The experiments chunk. Hashed experiment names separated by |,|. This is
-// typically set by SetExperimentList.
-extern const char kVariations[];
-
 // Installed extensions. |kExtensionID| should be formatted with an integer,
 // in the range [0, kExtensionIDMaxCount).
 const size_t kExtensionIDMaxCount = 10;
@@ -143,11 +114,6 @@ extern const char kNSExceptionTrace[];
 // target-action.
 extern const char kSendAction[];
 
-// Records Cocoa zombie/used-after-freed objects that resulted in a
-// deliberate crash.
-extern const char kZombie[];
-extern const char kZombieTrace[];
-
 }  // namespace mac
 #endif