Merge Crashpad to the 42.0.2311 branch

chrome/common/crash_keys.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_CRASH_KEYS_H_
 #define CHROME_COMMON_CRASH_KEYS_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/debug/crash_logging.h"
 
 namespace base {
 class CommandLine;
 }
 
 namespace crash_keys {
 
 // Registers all of the potential crash keys that can be sent to the crash
 // reporting server. Returns the size of the union of all keys.
 size_t RegisterChromeCrashKeys();
 
-// Sets the ID (based on |client_guid| which may either be a full GUID or a
-// GUID that was already stripped from its dashes -- in either cases this method
-// will strip remaining dashes before setting the crash key) by which this crash
-// reporting client can be identified.
-void SetCrashClientIdFromGUID(const std::string& client_guid);
+// 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
 // - renderer: the unique set of extension ids from all content scripts
 // - extension: the id of each extension running in this process (there can be
 //   multiple because of process collapsing).
 void SetActiveExtensions(const std::set<std::string>& extensions);
 
 // Sets the printer info. Data should be separated by ';' up to
 // kPrinterInfoCount substrings. Each substring will be truncated if necessary.
 class ScopedPrinterInfo {
  public:
   explicit ScopedPrinterInfo(const base::StringPiece& data);
   ~ScopedPrinterInfo();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(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[];
 
 // Process command line switches. |kSwitch| should be formatted with an integer,
 // in the range [1, kSwitchesMaxCount].
 const size_t kSwitchesMaxCount = 15;
@@ skipping 69 matching lines @@
 // deliberate crash.
 extern const char kZombie[];
 extern const char kZombieTrace[];
 
 }  // namespace mac
 #endif
 
 }  // namespace crash_keys
 
 #endif  // CHROME_COMMON_CRASH_KEYS_H_