Chrome Cleanup: re-open settings post-cleanup if reboot is needed

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>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/task_scheduler/task_traits.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h"
+#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_navigation_util.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/installer/util/scoped_token_privilege.h"
 #include "components/chrome_cleaner/public/constants/constants.h"
 #include "components/safe_browsing/common/safe_browsing_prefs.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/http/http_status_code.h"
+#include "ui/base/window_open_disposition.h"
 
 namespace safe_browsing {
 
 namespace {
 
 using ::chrome_cleaner::mojom::ChromePrompt;
 using ::chrome_cleaner::mojom::PromptAcceptance;
 using ::content::BrowserThread;
 
 // The global singleton instance. Exposed outside of GetInstance() so that it
@@ skipping 389 matching lines @@
 
   if (process_status.launch_status !=
       ChromeCleanerRunner::LaunchStatus::kSuccess) {
     idle_reason_ = IdleReason::kCleaningFailed;
     SetStateAndNotifyObservers(State::kIdle);
     return;
   }
 
   if (process_status.exit_code == kRebootRequiredExitCode) {
     SetStateAndNotifyObservers(State::kRebootRequired);
+    Browser* browser = chrome_cleaner_util::FindBrowser();
+    if (browser)

[ftirelo, 2017/07/10 21:27:44]

 Nit: please add {}

[proberge, 2017/07/11 14:37:09]

Done. Good catch!

+      chrome_cleaner_util::OpenSettingsPage(
+          browser, WindowOpenDisposition::NEW_BACKGROUND_TAB,
+          /*skip_if_already_opened=*/true);
     return;
   }
 
   if (process_status.exit_code == kRebootNotRequiredExitCode) {
     delegate_->ResetTaggedProfiles(
         g_browser_process->profile_manager()->GetLoadedProfiles(),
         base::BindOnce(&ChromeCleanerController::OnSettingsResetCompleted,
                        base::Unretained(this)));
     ResetCleanerDataAndInvalidateWeakPtrs();
     return;
@@ skipping 16 matching lines @@
       observer.OnRebootFailed();
   }
 }
 
 void ChromeCleanerController::OnSettingsResetCompleted() {
   idle_reason_ = IdleReason::kCleaningSucceeded;
   SetStateAndNotifyObservers(State::kIdle);
 }
 
 }  // namespace safe_browsing