Merge Crashpad to the 42.0.2311 branch

chrome/browser/crash_upload_list.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/crash_upload_list.h"
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #if defined(OS_WIN)
 #include "chrome/browser/crash_upload_list_win.h"
+#elif defined(OS_MACOSX)
+#include "chrome/browser/crash_upload_list_mac.h"
 #endif
 
 // static
 const char* CrashUploadList::kReporterLogFilename = "uploads.log";
 
 // static
 CrashUploadList* CrashUploadList::Create(Delegate* delegate) {
   base::FilePath crash_dir_path;
   PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path);
   base::FilePath upload_log_path =
       crash_dir_path.AppendASCII(kReporterLogFilename);
 #if defined(OS_WIN)
   return new CrashUploadListWin(delegate, upload_log_path);
+#elif defined(OS_MACOSX)
+  return new CrashUploadListMac(delegate, upload_log_path);
 #else
   return new CrashUploadList(delegate, upload_log_path);
 #endif
 }
 
 CrashUploadList::CrashUploadList(Delegate* delegate,
                                  const base::FilePath& upload_log_path)
     : UploadList(delegate, upload_log_path) {}
 
 CrashUploadList::~CrashUploadList() {}