Renaming zip_analyzer_results to archive_analyzer_results

chrome/utility/chrome_content_utility_client.cc

 // Copyright (c) 2012 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/utility/chrome_content_utility_client.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
@@ skipping 40 matching lines @@
 #include "chrome/utility/extensions/extensions_handler.h"
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) || \
     (BUILDFLAG(ENABLE_BASIC_PRINTING) && defined(OS_WIN))
 #include "chrome/utility/printing_handler.h"
 #endif
 
 #if defined(FULL_SAFE_BROWSING)
 #include "chrome/common/safe_archive_analyzer.mojom.h"
+#include "chrome/common/safe_browsing/archive_analyzer_results.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
-#include "chrome/common/safe_browsing/zip_analyzer_results.h"
 #if defined(OS_MACOSX)
 #include "chrome/utility/safe_browsing/mac/dmg_analyzer.h"
 #endif
 #endif
 
 namespace {
 
 class FilePatcherImpl : public chrome::mojom::FilePatcher {
  public:
   FilePatcherImpl() = default;
@@ skipping 84 matching lines @@
   }
 
  private:
   // chrome::mojom::SafeArchiveAnalyzer:
   void AnalyzeZipFile(base::File zip_file,
                       base::File temporary_file,
                       const AnalyzeZipFileCallback& callback) override {
     DCHECK(temporary_file.IsValid());
     DCHECK(zip_file.IsValid());
 
-    safe_browsing::zip_analyzer::Results results;
+    safe_browsing::ArchiveAnalyzerResults results;
     safe_browsing::zip_analyzer::AnalyzeZipFile(
         std::move(zip_file), std::move(temporary_file), &results);
     callback.Run(results);
   }
 
   void AnalyzeDmgFile(base::File dmg_file,
                       const AnalyzeDmgFileCallback& callback) override {
 #if defined(OS_MACOSX)
     DCHECK(dmg_file.IsValid());
-    safe_browsing::zip_analyzer::Results results;
+    safe_browsing::ArchiveAnalyzerResults results;
     safe_browsing::dmg::AnalyzeDMGFile(std::move(dmg_file), &results);
     callback.Run(results);
 #else
     NOTREACHED();
 #endif
   }
 
   DISALLOW_COPY_AND_ASSIGN(SafeArchiveAnalyzerImpl);
 };
 #endif  // defined(FULL_SAFE_BROWSING)
@@ skipping 131 matching lines @@
 
   return false;
 }
 
 // static
 void ChromeContentUtilityClient::PreSandboxStartup() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   extensions::ExtensionsHandler::PreSandboxStartup();
 #endif
 }