Make sure to not remove global error twice.

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 37 matching lines @@
 void MaybeExecuteSRTFromBlockingPool(
     const base::FilePath& downloaded_path,
     const scoped_refptr<SingleThreadTaskRunner>& task_runner,
     const base::Closure& success_callback,
     const base::Closure& failure_callback) {
   DCHECK(!downloaded_path.empty());
 
   if (base::PathExists(downloaded_path)) {
     base::FilePath executable_path(
         downloaded_path.ReplaceExtension(kExecutableExtension));
-    if (base::ReplaceFile(downloaded_path, executable_path, NULL)) {
+    if (base::ReplaceFile(downloaded_path, executable_path, nullptr)) {
       base::CommandLine srt_command_line(executable_path);
       srt_command_line.AppendSwitch(kChromePromptSwitch);
       base::Process srt_process(
           base::LaunchProcess(srt_command_line, base::LaunchOptions()));
       if (srt_process.IsValid()) {
         task_runner->PostTask(FROM_HERE, success_callback);
         return;
       }
     }
   }
@@ skipping 82 matching lines @@
   if (!interacted_) {
     // If user didn't interact with the bubble, it means they used the generic
     // close bubble button.
     RecordSRTPromptHistogram(SRT_PROMPT_CLOSED);
     g_browser_process->local_state()->SetBoolean(
         prefs::kSwReporterPendingPrompt, true);
   }
 }
 
 void SRTGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
+  // This is for cases where the UI doesn't go away quickly enough and user

[macourteau, 2016/04/20 17:46:39]

nit: this function and the one below have a lot of common code, maybe that can
be extracted into a helper function?

[MAD, 2016/04/20 17:48:12]

I wouldn't call this a lot of common code... Just a few lines. I don't think
it's worth it.

[macourteau, 2016/04/20 18:04:03]

It's still 10 lines that are exactly the same except for the name of the
histogram. I don't have a strong opinion, but I do think it would be better to
extract these. :)

+  // might click on the button more than once, or more than one button.
+  if (interacted_)
+    return;
   RecordSRTPromptHistogram(SRT_PROMPT_ACCEPTED);
   interacted_ = true;
-  global_error_service_->RemoveGlobalError(this);
+  if (global_error_service_) {
+    global_error_service_->RemoveGlobalError(this);
+    global_error_service_ = nullptr;
+  }
   MaybeExecuteSRT();
 }
 
 void SRTGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
+  // 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(SRT_PROMPT_DENIED);
   interacted_ = true;
-  global_error_service_->RemoveGlobalError(this);
+  if (global_error_service_) {
+    global_error_service_->RemoveGlobalError(this);
+    global_error_service_ = nullptr;
+  }
 
   BrowserThread::PostBlockingPoolTask(
       FROM_HERE, base::Bind(&DeleteFilesFromBlockingPool, downloaded_path_));
   OnUserinteractionDone();
 }
 
 bool SRTGlobalError::ShouldCloseOnDeactivate() const {
   return false;
 }
 
@@ skipping 32 matching lines @@
 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