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

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

Issue 2906103002: Post-cleanup settings reset. (Closed)
Patch Set: Addressed alito's comments 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/memory/singleton.h" 16 #include "base/memory/singleton.h"
17 #include "base/task_scheduler/post_task.h" 17 #include "base/task_scheduler/post_task.h"
18 #include "base/task_scheduler/task_traits.h" 18 #include "base/task_scheduler/task_traits.h"
19 #include "base/threading/thread_restrictions.h" 19 #include "base/threading/thread_restrictions.h"
20 #include "base/threading/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 22 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/profiles/profile_manager.h"
22 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h" 25 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win .h"
23 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h" 26 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win. h"
27 #include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
24 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h" 28 #include "chrome/browser/safe_browsing/chrome_cleaner/srt_client_info_win.h"
25 #include "components/chrome_cleaner/public/constants/constants.h" 29 #include "components/chrome_cleaner/public/constants/constants.h"
26 #include "components/safe_browsing/common/safe_browsing_prefs.h" 30 #include "components/safe_browsing/common/safe_browsing_prefs.h"
27 #include "content/public/browser/browser_thread.h" 31 #include "content/public/browser/browser_thread.h"
28 #include "net/http/http_status_code.h" 32 #include "net/http/http_status_code.h"
29 33
30 namespace safe_browsing { 34 namespace safe_browsing {
31 35
32 namespace { 36 namespace {
33 37
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 107
104 bool ChromeCleanerControllerDelegate:: 108 bool ChromeCleanerControllerDelegate::
105 SafeBrowsingExtendedReportingScoutEnabled() { 109 SafeBrowsingExtendedReportingScoutEnabled() {
106 return safe_browsing::SafeBrowsingExtendedReportingScoutEnabled(); 110 return safe_browsing::SafeBrowsingExtendedReportingScoutEnabled();
107 } 111 }
108 112
109 bool ChromeCleanerControllerDelegate::IsMetricsAndCrashReportingEnabled() { 113 bool ChromeCleanerControllerDelegate::IsMetricsAndCrashReportingEnabled() {
110 return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled(); 114 return ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
111 } 115 }
112 116
117 void ChromeCleanerControllerDelegate::InvokeTagProfileForResetting(
118 Profile* profile) {
119 std::unique_ptr<PostCleanupSettingsResetter> resetter(
120 PostCleanupSettingsResetter::Create());
121 resetter->TagForResetting(profile);
122 }
123
124 void ChromeCleanerControllerDelegate::InvokeResetPostCleanupSettingsIfTagged(
125 std::vector<Profile*> profiles,
126 base::OnceClosure continuation) {
127 PostCleanupSettingsResetter* resetter = PostCleanupSettingsResetter::Create();
128 resetter->ResetTaggedProfiles(
129 std::move(profiles),
130 resetter->ReleaseWithContinuationClosure(std::move(continuation)));
131 }
132
113 // static 133 // static
114 ChromeCleanerController* ChromeCleanerController::GetInstance() { 134 ChromeCleanerController* ChromeCleanerController::GetInstance() {
115 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 135 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
116 return base::Singleton<ChromeCleanerController>::get(); 136 return base::Singleton<ChromeCleanerController>::get();
117 } 137 }
118 138
119 void ChromeCleanerController::SetDelegateForTesting( 139 void ChromeCleanerController::SetDelegateForTesting(
120 ChromeCleanerControllerDelegate* delegate) { 140 ChromeCleanerControllerDelegate* delegate) {
121 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); 141 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
122 delegate_ = delegate ? delegate : real_delegate_.get(); 142 delegate_ = delegate ? delegate : real_delegate_.get();
(...skipping 29 matching lines...) Expand all
152 DCHECK(!reporter_invocation_); 172 DCHECK(!reporter_invocation_);
153 reporter_invocation_ = 173 reporter_invocation_ =
154 base::MakeUnique<SwReporterInvocation>(reporter_invocation); 174 base::MakeUnique<SwReporterInvocation>(reporter_invocation);
155 SetStateAndNotifyObservers(State::kScanning); 175 SetStateAndNotifyObservers(State::kScanning);
156 delegate_->FetchAndVerifyChromeCleaner(base::BindOnce( 176 delegate_->FetchAndVerifyChromeCleaner(base::BindOnce(
157 &ChromeCleanerController::OnChromeCleanerFetchedAndVerified, 177 &ChromeCleanerController::OnChromeCleanerFetchedAndVerified,
158 base::Unretained(this))); 178 base::Unretained(this)));
159 } 179 }
160 180
161 void ChromeCleanerController::ReplyWithUserResponse( 181 void ChromeCleanerController::ReplyWithUserResponse(
182 Profile* profile,
162 UserResponse user_response) { 183 UserResponse user_response) {
163 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 184 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
164 DCHECK(prompt_user_callback_); 185 DCHECK(prompt_user_callback_);
165 186
166 if (state() != State::kInfected) 187 if (state() != State::kInfected)
167 return; 188 return;
168 189
169 PromptAcceptance acceptance = PromptAcceptance::DENIED; 190 PromptAcceptance acceptance = PromptAcceptance::DENIED;
170 State new_state = State::kIdle; 191 State new_state = State::kIdle;
171 switch (user_response) { 192 switch (user_response) {
172 case UserResponse::kAccepted: 193 case UserResponse::kAccepted:
173 acceptance = PromptAcceptance::ACCEPTED; 194 acceptance = PromptAcceptance::ACCEPTED;
174 new_state = State::kCleaning; 195 new_state = State::kCleaning;
196 delegate_->InvokeTagProfileForResetting(profile);
175 break; 197 break;
176 case UserResponse::kDenied: // Fallthrough 198 case UserResponse::kDenied: // Fallthrough
177 case UserResponse::kDismissed: 199 case UserResponse::kDismissed:
178 acceptance = PromptAcceptance::DENIED; 200 acceptance = PromptAcceptance::DENIED;
179 idle_reason_ = IdleReason::kUserDeclinedCleanup; 201 idle_reason_ = IdleReason::kUserDeclinedCleanup;
180 new_state = State::kIdle; 202 new_state = State::kIdle;
181 break; 203 break;
182 } 204 }
183 205
184 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO) 206 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 SetStateAndNotifyObservers(State::kIdle); 382 SetStateAndNotifyObservers(State::kIdle);
361 return; 383 return;
362 } 384 }
363 385
364 if (process_status.exit_code == kRebootRequiredExitCode) { 386 if (process_status.exit_code == kRebootRequiredExitCode) {
365 SetStateAndNotifyObservers(State::kRebootRequired); 387 SetStateAndNotifyObservers(State::kRebootRequired);
366 return; 388 return;
367 } 389 }
368 390
369 if (process_status.exit_code == kRebootNotRequiredExitCode) { 391 if (process_status.exit_code == kRebootNotRequiredExitCode) {
370 idle_reason_ = IdleReason::kCleaningSucceeded; 392 delegate_->InvokeResetPostCleanupSettingsIfTagged(
371 SetStateAndNotifyObservers(State::kIdle); 393 g_browser_process->profile_manager()->GetLoadedProfiles(),
394 base::BindOnce(&ChromeCleanerController::OnSettingsResetCompleted,
395 base::Unretained(this)));
372 return; 396 return;
373 } 397 }
374 398
375 idle_reason_ = IdleReason::kCleaningFailed; 399 idle_reason_ = IdleReason::kCleaningFailed;
376 SetStateAndNotifyObservers(State::kIdle); 400 SetStateAndNotifyObservers(State::kIdle);
377 } 401 }
378 402
403 void ChromeCleanerController::OnSettingsResetCompleted() {
404 idle_reason_ = IdleReason::kCleaningSucceeded;
405 SetStateAndNotifyObservers(State::kIdle);
406 }
407
379 } // namespace safe_browsing 408 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698