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

Unified Diff: chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc

Issue 2932703006: Chrome Cleaner: Remove indirect base::FilePath mojo dependency. (Closed)
Patch Set: Address review comments, make tests pass 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
index 97e83b6802acfbb6938b0f3fb68f848542cecacb..5a548b3f9caa7ad40fbbb40319a440aea03c43c1 100644
--- a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
@@ -201,10 +201,19 @@ void MockChromeCleanerProcess::SendScanResults(
FROM_HERE, base::Bind([]() { exit(kDeliberateCrashExitCode); }));
}
+ std::vector<chrome_cleaner::mojom::FilePathPtr> files_to_delete;
Fabio Tirelo 2017/06/12 18:20:46 This only needs to be done if condition in line 21
proberge 2017/06/12 19:02:53 Line 214 looks like a pointer deref? Not a conditi
+ for (const base::FilePath& file_path : options_.files_to_delete()) {
+ auto data = reinterpret_cast<const uint16_t*>(file_path.value().c_str());
+ size_t data_size = file_path.value().size();
+ chrome_cleaner::mojom::FilePathPtr path =
+ chrome_cleaner::mojom::FilePath::New(
+ std::vector<uint16_t>(data, data + data_size));
+ files_to_delete.push_back(std::move(path));
+ }
+
(*chrome_prompt_ptr_)
->PromptUser(
- std::vector<base::FilePath>(options_.files_to_delete().begin(),
- options_.files_to_delete().end()),
+ std::move(files_to_delete),
base::BindOnce(&MockChromeCleanerProcess::PromptUserCallback,
base::Unretained(this), std::move(quit_closure)));
}

Powered by Google App Engine
This is Rietveld 408576698