Add functionality to prune old crash reports from the database.

client/crash_report_database_win.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 211 matching lines @@
   //! This marks the metadata as dirty, and on destruction, changes will be
   //! written to disk via Write().
   //!
   //! \return #kNoError on success. #kReportNotFound if there was no report with
   //!     the specified UUID. #kBusyError if the report was not in the specified
   //!     state.
   OperationStatus FindSingleReportAndMarkDirty(const UUID& uuid,
                                                ReportState desired_state,
                                                ReportDisk** report_disk);
 
+  //! \brief Removes a report from the metadata database, without touching the
+  //!     on-disk file.
+  //!
+  //! The returned report is only valid if CrashReportDatabase::kNoError is
+  //! returned. This will mark the database as dirty. Future metadata
+  //! operations for this report will not succeed.
+  //!
+  //! \param[in] uuid The report identifier to remove.
+  //! \param[out] report_disk The found report, valid only if
+  //!     CrashReportDatabase::kNoError is returned.
+  OperationStatus DeleteReport(const UUID& uuid,
+                               CrashReportDatabase::Report* report);

[Mark Mentovai, 2015/10/07 03:54:27]

Returning a CrashReportDatabase::Report for something that you’re dumping the
metadata for seems a little bogus. How about if this passed back just the
FilePath that the caller will delete?

[Robert Sesek, 2015/10/07 16:24:34]

Done.

+
  private:
   Metadata(FileHandle handle, const base::FilePath& report_dir);
 
   bool Rewind();
 
   void Read();
   void Write();
 
   //! \brief Confirms that the corresponding report actually exists on disk
   //!     (that is, the dump file has not been removed), and that the report is
@@ skipping 102 matching lines @@
   if (report_iter == reports_.end())
     return CrashReportDatabase::kReportNotFound;
   OperationStatus os = VerifyReport(*report_iter, desired_state);
   if (os == CrashReportDatabase::kNoError) {
     dirty_ = true;
     *report_disk = &*report_iter;
   }
   return os;
 }
 
+OperationStatus Metadata::DeleteReport(const UUID& uuid,
+                                       CrashReportDatabase::Report* report) {
+  auto report_iter = std::find_if(
+      reports_.begin(), reports_.end(), [uuid](const ReportDisk& report) {
+        return report.uuid == uuid;
+      });
+  if (report_iter == reports_.end())
+    return CrashReportDatabase::kReportNotFound;
+  *report = *report_iter;
+  reports_.erase(report_iter);
+  dirty_ = true;
+  return kNoError;

[scottmg, 2015/10/06 22:22:07]

This needs to be CrashReportDatabase::kNoError.

[Robert Sesek, 2015/10/07 16:24:34]

Done.

+}
+
 Metadata::Metadata(FileHandle handle, const base::FilePath& report_dir)
     : handle_(handle), report_dir_(report_dir), dirty_(false), reports_() {
 }
 
 bool Metadata::Rewind() {
   FileOffset result = LoggingSeekFile(handle_.get(), 0, SEEK_SET);
   DCHECK_EQ(result, 0);
   return result == 0;
 }
 
@@ skipping 358 matching lines @@
     report_disk->state =
         successful ? ReportState::kCompleted : ReportState::kPending;
   }
 
   // Call Settings::SetLastUploadAttemptTime().
   // https://code.google.com/p/crashpad/issues/detail?id=13.
 
   return os;
 }
 
+OperationStatus CrashReportDatabaseWin::DeleteReport(const UUID& uuid) {

[scottmg, 2015/10/06 22:22:07]

There's no declaration for this method.

[Robert Sesek, 2015/10/07 16:24:34]

Done.

+  INITIALIZATION_STATE_DCHECK_VALID(initialized_);
+
+  scoped_ptr<Metadata> metadata(AcquireMetadata());
+  if (!metadata)
+    return kDatabaseError;
+
+  Report report;
+  OperationStatus os = metadata->DeleteReport(uuid, &report);
+  if (os != kNoError)
+    return os;
+
+  if (!DeleteFile(report.file_path.value().c_str())) {
+    PLOG(ERROR) << "DeleteFile "
+                << base::UTF16ToUTF8(report.file_path.value());
+    return CrashReportDatabase::kFileSystemError;

[Mark Mentovai, 2015/10/07 03:54:27]

You don’t need CrashReportDatabase:: here.

[Robert Sesek, 2015/10/07 16:24:34]

Done.

+  }
+  return kNoError;
+}
+
 OperationStatus CrashReportDatabaseWin::SkipReportUpload(const UUID& uuid) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
 
   scoped_ptr<Metadata> metadata(AcquireMetadata());
   if (!metadata)
     return kDatabaseError;
   ReportDisk* report_disk;
   OperationStatus os = metadata->FindSingleReportAndMarkDirty(
       uuid, ReportState::kPending, &report_disk);
   if (os == CrashReportDatabase::kNoError)
@@ skipping 11 matching lines @@
 // static
 scoped_ptr<CrashReportDatabase> CrashReportDatabase::Initialize(
     const base::FilePath& path) {
   scoped_ptr<CrashReportDatabaseWin> database_win(
       new CrashReportDatabaseWin(path));
   return database_win->Initialize() ? database_win.Pass()
                                     : scoped_ptr<CrashReportDatabaseWin>();
 }
 
 }  // namespace crashpad