diff options
| author | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 00:09:05 +0000 |
|---|---|---|
| committer | rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-15 00:09:05 +0000 |
| commit | 0daaebfe9826bca26d41bf979fa085f26b5ccf95 (patch) | |
| tree | 1ab42ee326cf87453e3a340e83385813cdbcb50a /components/breakpad/browser | |
| parent | 063f03e36ef9f73e300458a2f6cf03b49161348c (diff) | |
| download | chromium_src-0daaebfe9826bca26d41bf979fa085f26b5ccf95.zip chromium_src-0daaebfe9826bca26d41bf979fa085f26b5ccf95.tar.gz chromium_src-0daaebfe9826bca26d41bf979fa085f26b5ccf95.tar.bz2 | |
Remove CreatePlatformFile from content shell.
BUG=322664
Review URL: https://codereview.chromium.org/184003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/breakpad/browser')
| -rw-r--r-- | components/breakpad/browser/crash_dump_manager_android.cc | 20 | ||||
| -rw-r--r-- | components/breakpad/browser/crash_dump_manager_android.h | 8 |
2 files changed, 13 insertions, 15 deletions
diff --git a/components/breakpad/browser/crash_dump_manager_android.cc b/components/breakpad/browser/crash_dump_manager_android.cc index 75d03b2..a8f4c38 100644 --- a/components/breakpad/browser/crash_dump_manager_android.cc +++ b/components/breakpad/browser/crash_dump_manager_android.cc @@ -55,22 +55,20 @@ CrashDumpManager::~CrashDumpManager() { BrowserChildProcessObserver::Remove(this); } -int CrashDumpManager::CreateMinidumpFile(int child_process_id) { +base::File CrashDumpManager::CreateMinidumpFile(int child_process_id) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER)); base::FilePath minidump_path; if (!base::CreateTemporaryFile(&minidump_path)) - return base::kInvalidPlatformFileValue; + return base::File(); - base::PlatformFileError error; // We need read permission as the minidump is generated in several phases // and needs to be read at some point. - int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ | - base::PLATFORM_FILE_WRITE; - base::PlatformFile minidump_file = - base::CreatePlatformFile(minidump_path, flags, NULL, &error); - if (minidump_file == base::kInvalidPlatformFileValue) { + int flags = base::File::FLAG_OPEN | base::File::FLAG_READ | + base::File::FLAG_WRITE; + base::File minidump_file(minidump_path, flags); + if (!minidump_file.IsValid()) { LOG(ERROR) << "Failed to create temporary file, crash won't be reported."; - return base::kInvalidPlatformFileValue; + return base::File(); } { @@ -78,7 +76,7 @@ int CrashDumpManager::CreateMinidumpFile(int child_process_id) { DCHECK(!ContainsKey(child_process_id_to_minidump_path_, child_process_id)); child_process_id_to_minidump_path_[child_process_id] = minidump_path; } - return minidump_file; + return minidump_file.Pass(); } // static @@ -116,7 +114,7 @@ void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path, base::DeleteFile(minidump_path, false); return; } - LOG(INFO) << "Crash minidump successfully generated: " << + VLOG(1) << "Crash minidump successfully generated: " << instance_->crash_dump_dir_.Append(filename).value(); } diff --git a/components/breakpad/browser/crash_dump_manager_android.h b/components/breakpad/browser/crash_dump_manager_android.h index aa79fc6..fdb57d7 100644 --- a/components/breakpad/browser/crash_dump_manager_android.h +++ b/components/breakpad/browser/crash_dump_manager_android.h @@ -7,8 +7,8 @@ #include <map> +#include "base/files/file.h" #include "base/files/file_path.h" -#include "base/platform_file.h" #include "base/process/process.h" #include "base/synchronization/lock.h" #include "content/public/browser/browser_child_process_observer.h" @@ -41,9 +41,9 @@ class CrashDumpManager : public content::BrowserChildProcessObserver, virtual ~CrashDumpManager(); - // Returns a file descriptor that should be used to generate a minidump for - // the process |child_process_id|. - int CreateMinidumpFile(int child_process_id); + // Returns a file that should be used to generate a minidump for the process + // |child_process_id|. + base::File CreateMinidumpFile(int child_process_id); private: typedef std::map<int, base::FilePath> ChildProcessIDToMinidumpPath; |