| Index: chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc
|
| diff --git a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc
|
| index 478bee0c12233d1e7246d64c80ad185050f59852..aa588eee51632f70c1bd0f3babc9224992875699 100644
|
| --- a/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc
|
| +++ b/chrome/browser/safe_browsing/sandboxed_zip_analyzer.cc
|
| @@ -9,7 +9,7 @@
|
| #include "base/bind.h"
|
| #include "base/files/file_util.h"
|
| #include "base/task_scheduler/post_task.h"
|
| -#include "chrome/common/safe_browsing/zip_analyzer_results.h"
|
| +#include "chrome/common/safe_browsing/archive_analyzer_results.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -67,8 +67,9 @@ void SandboxedZipAnalyzer::PrepareFileToAnalyze() {
|
| void SandboxedZipAnalyzer::ReportFileFailure() {
|
| DCHECK(!utility_process_mojo_client_);
|
|
|
| - content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
|
| - base::BindOnce(callback_, Results()));
|
| + content::BrowserThread::PostTask(
|
| + content::BrowserThread::UI, FROM_HERE,
|
| + base::BindOnce(callback_, ArchiveAnalyzerResults()));
|
| }
|
|
|
| void SandboxedZipAnalyzer::AnalyzeFile(base::File file, base::File temp_file) {
|
| @@ -79,8 +80,8 @@ void SandboxedZipAnalyzer::AnalyzeFile(base::File file, base::File temp_file) {
|
| content::UtilityProcessMojoClient<chrome::mojom::SafeArchiveAnalyzer>>(
|
| l10n_util::GetStringUTF16(
|
| IDS_UTILITY_PROCESS_SAFE_BROWSING_ZIP_FILE_ANALYZER_NAME));
|
| - utility_process_mojo_client_->set_error_callback(
|
| - base::Bind(&SandboxedZipAnalyzer::AnalyzeFileDone, this, Results()));
|
| + utility_process_mojo_client_->set_error_callback(base::Bind(
|
| + &SandboxedZipAnalyzer::AnalyzeFileDone, this, ArchiveAnalyzerResults()));
|
|
|
| utility_process_mojo_client_->Start();
|
|
|
| @@ -89,7 +90,8 @@ void SandboxedZipAnalyzer::AnalyzeFile(base::File file, base::File temp_file) {
|
| base::Bind(&SandboxedZipAnalyzer::AnalyzeFileDone, this));
|
| }
|
|
|
| -void SandboxedZipAnalyzer::AnalyzeFileDone(const Results& results) {
|
| +void SandboxedZipAnalyzer::AnalyzeFileDone(
|
| + const ArchiveAnalyzerResults& results) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
| utility_process_mojo_client_.reset();
|
|
|