Merge Crashpad to the 42.0.2311 branch

components/crash/app/crash_reporter_client.h

 // Copyright 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 COMPONENTS_CRASH_APP_CRASH_REPORTER_CLIENT_H_
 #define COMPONENTS_CRASH_APP_CRASH_REPORTER_CLIENT_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
@@ skipping 27 matching lines @@
 // The components's embedder API should only be used by the component.
 CrashReporterClient* GetCrashReporterClient();
 #endif
 
 // Interface that the embedder implements.
 class CrashReporterClient {
  public:
   CrashReporterClient();
   virtual ~CrashReporterClient();
 
+#if !defined(OS_MACOSX)
   // Sets the crash reporting client ID, a unique identifier for the client
   // that is sending crash reports. After it is set, it should not be changed.
   // |client_guid| may either be a full GUID or a GUID that was already stripped
   // from its dashes.
+  //
+  // On Mac OS X, this is the responsibility of Crashpad, and can not be set
+  // directly by the client.
   virtual void SetCrashReporterClientIdFromGUID(const std::string& client_guid);
+#endif
 
 #if defined(OS_WIN)
   // Returns true if an alternative location to store the minidump files was
   // specified. Returns true if |crash_dir| was set.
   virtual bool GetAlternativeCrashDumpLocation(base::FilePath* crash_dir);
 
   // Returns a textual description of the product type and version to include
   // in the crash report.
   virtual void GetProductNameAndVersion(const base::FilePath& exe_path,
                                         base::string16* product_name,
@@ skipping 71 matching lines @@
 
 #if defined(OS_ANDROID)
   // Returns the descriptor key of the android minidump global descriptor.
   virtual int GetAndroidMinidumpDescriptor();
 
   // Returns true if breakpad microdumps should be enabled. This orthogonal to
   // the standard minidump uploader (which depends on the user consent).
   virtual bool ShouldEnableBreakpadMicrodumps();
 #endif
 
-#if defined(OS_MACOSX)
-  // Install additional breakpad filter callbacks.
-  virtual void InstallAdditionalFilters(BreakpadRef breakpad);
-#endif
-
   // Returns true if breakpad should run in the given process type.
   virtual bool EnableBreakpadForProcess(const std::string& process_type);
 };
 
 }  // namespace crash_reporter
 
 #endif  // COMPONENTS_CRASH_APP_CRASH_REPORTER_CLIENT_H_