Merge Crashpad to the 42.0.2311 branch

chrome/common/chrome_paths.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/common/chrome_paths.h"
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 186 matching lines @@
       if (!base::android::GetCacheDirectory(&cur))
         return false;
 #else
       // The crash reports are always stored relative to the default user data
       // directory.  This avoids the problem of having to re-initialize the
       // exception handler after parsing command line options, which may
       // override the location of the app's profile directory.
       if (!GetDefaultUserDataDirectory(&cur))
         return false;
 #endif
+#if defined(OS_MACOSX)
+      cur = cur.Append(FILE_PATH_LITERAL("Crashpad"));
+#else
       cur = cur.Append(FILE_PATH_LITERAL("Crash Reports"));
+#endif
       create_dir = true;
       break;
 #if defined(OS_WIN)
     case chrome::DIR_WATCHER_DATA:
       // The watcher data is always stored relative to the default user data
       // directory.  This allows the watcher to be initialized before
       // command-line options have been parsed.
       if (!GetDefaultUserDataDirectory(&cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("Diagnostics"));
@@ skipping 364 matching lines @@
 
 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
   g_invalid_specified_user_data_dir.Get() = user_data_dir;
 }
 
 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
   return g_invalid_specified_user_data_dir.Get();
 }
 
 }  // namespace chrome