Chrome Cleaner UI: Add logs upload permission checkbox to the dialog

chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

 // Copyright 2017 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/chrome_cleaner/chrome_cleaner_controller_win.h"
 
 #include <windows.h>
 
 #include <utility>
 
@@ skipping 23 matching lines @@
 #include "net/http/http_status_code.h"
 
 namespace safe_browsing {
 
 namespace {
 
 using ::chrome_cleaner::mojom::ChromePrompt;
 using ::chrome_cleaner::mojom::PromptAcceptance;
 using ::content::BrowserThread;
 
-// Keeps track of whether GetInstance() has been called.
-bool g_instance_exists = false;
+// The global singleton instance. Exposed outside of GetInstance() so that it
+// can be reset by tests.
+ChromeCleanerController* g_controller = nullptr;
 
 // TODO(alito): Move these shared exit codes to the chrome_cleaner component.
 // https://crbug.com/727956
 constexpr int kRebootRequiredExitCode = 15;
 constexpr int kRebootNotRequiredExitCode = 0;
 
 // Attempts to change the Chrome Cleaner binary's suffix to ".exe". Will return
 // an empty FilePath on failure. Should be called on a sequence with traits
 // appropriate for IO operations.
 base::FilePath VerifyAndRenameDownloadedCleaner(
@@ skipping 76 matching lines @@
     PostCleanupSettingsResetter().ResetTaggedProfiles(
         std::move(profiles), std::move(continuation),
         base::MakeUnique<PostCleanupSettingsResetter::Delegate>());
   }
 }
 
 // static
 ChromeCleanerController* ChromeCleanerController::GetInstance() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  static ChromeCleanerController* const kInstance =
-      new ChromeCleanerController();
-  g_instance_exists = true;
-  return kInstance;
+  if (!g_controller)
+    g_controller = new ChromeCleanerController();
+
+  return g_controller;
 }
 
 // static
 bool ChromeCleanerController::ShouldShowCleanupInSettingsUI() {
   // Short-circuit if the instance doesn't exist to avoid creating it during
   // navigation to chrome://settings.
-  if (!g_instance_exists)
+  if (!g_controller)
     return false;
 
   State state = GetInstance()->state();
   return state == State::kInfected || state == State::kCleaning ||
          state == State::kRebootRequired;
 }
 
+void ChromeCleanerController::SetLogsEnabled(bool logs_enabled) {
+  if (logs_enabled_ == logs_enabled)
+    return;
+
+  logs_enabled_ = logs_enabled;
+  for (auto& observer : observer_list_)
+    observer.OnLogsEnabledChanged(logs_enabled_);
+}
+
 void ChromeCleanerController::SetDelegateForTesting(
     ChromeCleanerControllerDelegate* delegate) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   delegate_ = delegate ? delegate : real_delegate_.get();
   DCHECK(delegate_);
 }
 
-void ChromeCleanerController::DismissRebootForTesting() {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  DCHECK_EQ(State::kRebootRequired, state());
-  state_ = State::kIdle;
+// static
+void ChromeCleanerController::ResetInstanceForTesting() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  if (g_controller) {
+    delete g_controller;
+    g_controller = nullptr;
+  }
 }
 
 void ChromeCleanerController::AddObserver(Observer* observer) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   observer_list_.AddObserver(observer);
   NotifyObserver(observer);
 }
 
 void ChromeCleanerController::RemoveObserver(Observer* observer) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
@@ skipping 26 matching lines @@
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
   if (state() != State::kInfected)
     return;
 
   DCHECK(prompt_user_callback_);
 
   PromptAcceptance acceptance = PromptAcceptance::DENIED;
   State new_state = State::kIdle;
   switch (user_response) {
-    case UserResponse::kAccepted:
-      acceptance = PromptAcceptance::ACCEPTED;
+    case UserResponse::kAcceptedWithLogs:
+      acceptance = PromptAcceptance::ACCEPTED_WITH_LOGS;
+      SetLogsEnabled(true);
       new_state = State::kCleaning;
       delegate_->TagForResetting(profile);
       break;
+    case UserResponse::kAcceptedWithoutLogs:
+      acceptance = PromptAcceptance::ACCEPTED_WITHOUT_LOGS;
+      SetLogsEnabled(false);
+      new_state = State::kCleaning;
+      delegate_->TagForResetting(profile);
+      break;
     case UserResponse::kDenied:  // Fallthrough
     case UserResponse::kDismissed:
       acceptance = PromptAcceptance::DENIED;
       idle_reason_ = IdleReason::kUserDeclinedCleanup;
       new_state = State::kIdle;
       break;
   }
 
   BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
       ->PostTask(FROM_HERE,
@@ skipping 217 matching lines @@
       observer.OnRebootFailed();
   }
 }
 
 void ChromeCleanerController::OnSettingsResetCompleted() {
   idle_reason_ = IdleReason::kCleaningSucceeded;
   SetStateAndNotifyObservers(State::kIdle);
 }
 
 }  // namespace safe_browsing