Update Crashpad to b35ee1fca18956f3c27ba124d6dc456a723c7670

third_party/crashpad/crashpad/handler/crash_report_upload_thread.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 172 matching lines @@
       return;
     }
   }
 }
 
 void CrashReportUploadThread::ProcessPendingReport(
     const CrashReportDatabase::Report& report) {
   Settings* const settings = database_->GetSettings();
 
   bool uploads_enabled;
-  if (!settings->GetUploadsEnabled(&uploads_enabled) ||
-      !uploads_enabled ||
-      url_.empty()) {
-    // If the upload-enabled state can’t be determined, uploads are disabled, or
-    // there’s no URL to upload to, don’t attempt to upload the new report.
+  if (url_.empty() ||
+      (!report.upload_explicitly_requested &&
+       (!settings->GetUploadsEnabled(&uploads_enabled) || !uploads_enabled))) {
+    // Don’t attempt an upload if there’s no URL to upload to. Allow upload if
+    // it has been explicitly requested by the user, otherwise, respect the
+    // upload-enabled state stored in the database’s settings.
     database_->SkipReportUpload(report.uuid);
     return;
   }
 
   // This currently implements very simplistic rate-limiting, compatible with
   // the Breakpad client, where the strategy is to permit one upload attempt per
   // hour, and retire reports that would exceed this limit or for which the
   // upload fails on the first attempt.
   //
   // TODO(mark): Provide a proper rate-limiting strategy and allow for failed
@@ skipping 36 matching lines @@
     case CrashReportDatabase::kBusyError:
       return;
 
     case CrashReportDatabase::kReportNotFound:
     case CrashReportDatabase::kFileSystemError:
     case CrashReportDatabase::kDatabaseError:
       // In these cases, SkipReportUpload() might not work either, but it’s best
       // to at least try to get the report out of the way.
       database_->SkipReportUpload(report.uuid);
       return;
+
+    case CrashReportDatabase::kCannotRequestUpload:
+      NOTREACHED();
+      return;
   }
 
   CallRecordUploadAttempt call_record_upload_attempt(database_, upload_report);
 
   std::string response_body;
   UploadResult upload_result = UploadReport(upload_report, &response_body);
   switch (upload_result) {
     case UploadResult::kSuccess:
       call_record_upload_attempt.Disarm();
       database_->RecordUploadAttempt(upload_report, true, response_body);
@@ skipping 66 matching lines @@
   }
 
   return UploadResult::kSuccess;
 }
 
 void CrashReportUploadThread::DoWork(const WorkerThread* thread) {
   ProcessPendingReports();
 }
 
 }  // namespace crashpad