Merge to M57: Remove popup overlay from MHTML when requested

chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h

Index: chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
diff --git a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
index e1c78430d360acddb004d69b58201bf8c080137b..59272ad5ec4d1d20f5626c21a10d22d61271465a 100644
--- a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
+++ b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h
@@ -48,7 +48,7 @@ class OfflinePageMHTMLArchiver : public OfflinePageArchiver {
 
   // OfflinePageArchiver implementation:
   void CreateArchive(const base::FilePath& archives_dir,
-                     int64_t archive_id,
+                     const CreateArchiveParams& create_archive_params,
                      const CreateArchiveCallback& callback) override;
 
  protected:
@@ -58,7 +58,7 @@ class OfflinePageMHTMLArchiver : public OfflinePageArchiver {
   // Try to generate MHTML.
   // Might be overridden for testing purpose.
   virtual void GenerateMHTML(const base::FilePath& archives_dir,
-                             int64_t archive_id);
+                             const CreateArchiveParams& create_archive_params);
 
   // Callback for Generating MHTML.
   void OnGenerateMHTMLDone(const GURL& url,