Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(496)

Side by Side Diff: chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.cc

Issue 2906103002: Post-cleanup settings reset. (Closed)
Patch Set: Use base::DoNothing Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_ win.h" 5 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_ win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/bind_helpers.h" 12 #include "base/bind_helpers.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/files/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/location.h" 15 #include "base/location.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
18 #include "base/task_scheduler/post_task.h" 18 #include "base/task_scheduler/post_task.h"
19 #include "base/task_scheduler/task_traits.h" 19 #include "base/task_scheduler/task_traits.h"
20 #include "base/threading/thread_restrictions.h" 20 #include "base/threading/thread_restrictions.h"
21 #include "base/threading/thread_task_runner_handle.h" 21 #include "base/threading/thread_task_runner_handle.h"
22 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 23 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
24 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/profiles/profile_manager.h"
23 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h" 26 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h"
24 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h" 27 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h"
28 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
25 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h" 29 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"
26 #include "chrome/installer/util/scoped_token_privilege.h" 30 #include "chrome/installer/util/scoped_token_privilege.h"
27 #include "components/chrome_cleaner/public/constants/constants.h" 31 #include "components/chrome_cleaner/public/constants/constants.h"
28 #include "components/safe_browsing/common/safe_browsing_prefs.h" 32 #include "components/safe_browsing/common/safe_browsing_prefs.h"
29 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
30 #include "net/http/http_status_code.h" 34 #include "net/http/http_status_code.h"
31 35
32 namespace safe_browsing { 36 namespace safe_browsing {
33 37
34 namespace { 38 namespace {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 113
110 bool ChromeCleanerControllerDelegate:: 114 bool ChromeCleanerControllerDelegate::
111 SafeBrowsingExtendedReportingScoutEnabled() { 115 SafeBrowsingExtendedReportingScoutEnabled() {
112 return safe_browsing::SafeBrowsingExtendedReportingScoutEnabled(); 116 return safe_browsing::SafeBrowsingExtendedReportingScoutEnabled();
113 } 117 }
114 118
115 bool ChromeCleanerControllerDelegate::IsMetricsAndCrashReportingEnabled() { 119 bool ChromeCleanerControllerDelegate::IsMetricsAndCrashReportingEnabled() {
116 return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(); 120 return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
117 } 121 }
118 122
123 void ChromeCleanerControllerDelegate::TagForResetting(Profile* profile) {
124 if (PostCleanupSettingsResetter::IsEnabled())
125 PostCleanupSettingsResetter().TagForResetting(profile);
126 }
127
128 void ChromeCleanerControllerDelegate::ResetTaggedProfiles(
129 std::vector<Profile*> profiles,
130 base::OnceClosure continuation) {
131 if (PostCleanupSettingsResetter::IsEnabled()) {
132 PostCleanupSettingsResetter().ResetTaggedProfiles(
133 std::move(profiles), std::move(continuation),
134 base::MakeUnique<PostCleanupSettingsResetter::Delegate>());
135 }
136 }
137
119 // static 138 // static
120 ChromeCleanerController* ChromeCleanerController::GetInstance() { 139 ChromeCleanerController* ChromeCleanerController::GetInstance() {
121 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 140 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
122 141
123 static ChromeCleanerController* const kInstance = 142 static ChromeCleanerController* const kInstance =
124 new ChromeCleanerController(); 143 new ChromeCleanerController();
125 g_instance_exists = true; 144 g_instance_exists = true;
126 return kInstance; 145 return kInstance;
127 } 146 }
128 147
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 base::MakeUnique<SwReporterInvocation>(reporter_invocation); 190 base::MakeUnique<SwReporterInvocation>(reporter_invocation);
172 SetStateAndNotifyObservers(State::kScanning); 191 SetStateAndNotifyObservers(State::kScanning);
173 // base::Unretained is safe because the ChromeCleanerController instance is 192 // base::Unretained is safe because the ChromeCleanerController instance is
174 // guaranteed to outlive the UI thread. 193 // guaranteed to outlive the UI thread.
175 delegate_->FetchAndVerifyChromeCleaner(base::BindOnce( 194 delegate_->FetchAndVerifyChromeCleaner(base::BindOnce(
176 &ChromeCleanerController::OnChromeCleanerFetchedAndVerified, 195 &ChromeCleanerController::OnChromeCleanerFetchedAndVerified,
177 base::Unretained(this))); 196 base::Unretained(this)));
178 } 197 }
179 198
180 void ChromeCleanerController::ReplyWithUserResponse( 199 void ChromeCleanerController::ReplyWithUserResponse(
200 Profile* profile,
181 UserResponse user_response) { 201 UserResponse user_response) {
182 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); 202 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
183 DCHECK(prompt_user_callback_); 203 DCHECK(prompt_user_callback_);
184 204
185 if (state() != State::kInfected) 205 if (state() != State::kInfected)
186 return; 206 return;
187 207
188 PromptAcceptance acceptance = PromptAcceptance::DENIED; 208 PromptAcceptance acceptance = PromptAcceptance::DENIED;
189 State new_state = State::kIdle; 209 State new_state = State::kIdle;
190 switch (user_response) { 210 switch (user_response) {
191 case UserResponse::kAccepted: 211 case UserResponse::kAccepted:
192 acceptance = PromptAcceptance::ACCEPTED; 212 acceptance = PromptAcceptance::ACCEPTED;
193 new_state = State::kCleaning; 213 new_state = State::kCleaning;
214 delegate_->TagForResetting(profile);
194 break; 215 break;
195 case UserResponse::kDenied: // Fallthrough 216 case UserResponse::kDenied: // Fallthrough
196 case UserResponse::kDismissed: 217 case UserResponse::kDismissed:
197 acceptance = PromptAcceptance::DENIED; 218 acceptance = PromptAcceptance::DENIED;
198 idle_reason_ = IdleReason::kUserDeclinedCleanup; 219 idle_reason_ = IdleReason::kUserDeclinedCleanup;
199 new_state = State::kIdle; 220 new_state = State::kIdle;
200 break; 221 break;
201 } 222 }
202 223
203 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO) 224 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 SetStateAndNotifyObservers(State::kIdle); 411 SetStateAndNotifyObservers(State::kIdle);
391 return; 412 return;
392 } 413 }
393 414
394 if (process_status.exit_code == kRebootRequiredExitCode) { 415 if (process_status.exit_code == kRebootRequiredExitCode) {
395 SetStateAndNotifyObservers(State::kRebootRequired); 416 SetStateAndNotifyObservers(State::kRebootRequired);
396 return; 417 return;
397 } 418 }
398 419
399 if (process_status.exit_code == kRebootNotRequiredExitCode) { 420 if (process_status.exit_code == kRebootNotRequiredExitCode) {
400 idle_reason_ = IdleReason::kCleaningSucceeded; 421 delegate_->ResetTaggedProfiles(
401 SetStateAndNotifyObservers(State::kIdle); 422 g_browser_process->profile_manager()->GetLoadedProfiles(),
423 base::BindOnce(&ChromeCleanerController::OnSettingsResetCompleted,
424 base::Unretained(this)));
425 ResetCleanerDataAndInvalidateWeakPtrs();
402 return; 426 return;
403 } 427 }
404 428
405 idle_reason_ = IdleReason::kCleaningFailed; 429 idle_reason_ = IdleReason::kCleaningFailed;
406 SetStateAndNotifyObservers(State::kIdle); 430 SetStateAndNotifyObservers(State::kIdle);
407 } 431 }
408 432
409 void ChromeCleanerController::InitiateReboot() { 433 void ChromeCleanerController::InitiateReboot() {
410 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); 434 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
411 435
412 installer::ScopedTokenPrivilege scoped_se_shutdown_privilege( 436 installer::ScopedTokenPrivilege scoped_se_shutdown_privilege(
413 SE_SHUTDOWN_NAME); 437 SE_SHUTDOWN_NAME);
414 if (!scoped_se_shutdown_privilege.is_enabled() || 438 if (!scoped_se_shutdown_privilege.is_enabled() ||
415 !::ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_SOFTWARE | 439 !::ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_SOFTWARE |
416 SHTDN_REASON_MINOR_OTHER | 440 SHTDN_REASON_MINOR_OTHER |
417 SHTDN_REASON_FLAG_PLANNED)) { 441 SHTDN_REASON_FLAG_PLANNED)) {
418 for (auto& observer : observer_list_) 442 for (auto& observer : observer_list_)
419 observer.OnRebootFailed(); 443 observer.OnRebootFailed();
420 } 444 }
421 } 445 }
422 446
447 void ChromeCleanerController::OnSettingsResetCompleted() {
448 idle_reason_ = IdleReason::kCleaningSucceeded;
449 SetStateAndNotifyObservers(State::kIdle);
450 }
451
423 } // namespace safe_browsing 452 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698