Make GlobalErrorService's ownership model slightly less insane.

chrome/browser/safe_browsing/srt_global_error_win.cc

 // Copyright 2014 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/safe_browsing/srt_global_error_win.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 187 matching lines @@
 bool SRTGlobalError::ShouldCloseOnDeactivate() const {
   return false;
 }
 
 void SRTGlobalError::MaybeExecuteSRT() {
   if (downloaded_path_.empty()) {
     FallbackToDownloadPage();
     return;
   }
   // At this point, this object owns itself, since ownership has been taken back
-  // from the global_error_service_ in the call to RemoveGlobalError. This means
-  // that it is safe to use base::Unretained here.
+  // from the global_error_service_ in the call to OnUserInteractionStarted.
+  // This means that it is safe to use base::Unretained here.
   BrowserThread::PostBlockingPoolTask(
       FROM_HERE,
       base::Bind(
           &MaybeExecuteSRTFromBlockingPool, downloaded_path_,
           ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(),
           base::ThreadTaskRunnerHandle::Get(),
           base::Bind(&SRTGlobalError::OnUserinteractionDone,
                      base::Unretained(this)),
           base::Bind(&SRTGlobalError::FallbackToDownloadPage,
                      base::Unretained(this))));
@@ skipping 17 matching lines @@
 
 void SRTGlobalError::OnUserinteractionStarted(
     SRTPromptHistogramValue histogram_value) {
   // This is for cases where the UI doesn't go away quickly enough and user
   // might click on the button more than once, or more than one button.
   if (interacted_)
     return;
   RecordSRTPromptHistogram(histogram_value);
   interacted_ = true;
   if (global_error_service_) {
-    global_error_service_->RemoveGlobalError(this);
+    global_error_service_->RemoveOwnedGlobalError(this).release();
     global_error_service_ = nullptr;
   }
 }
 
 void SRTGlobalError::OnUserinteractionDone() {
   DCHECK(interacted_);
   // Once the user interacted with the bubble, we can forget about any pending
   // prompt.
   g_browser_process->local_state()->SetBoolean(prefs::kSwReporterPendingPrompt,
                                                false);
   delete this;
 }
 
 }  // namespace safe_browsing