Merge to M57: Remove popup overlay from MHTML when requested

components/offline_pages/core/offline_page_test_archiver.cc

 // Copyright 2015 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 "components/offline_pages/core/offline_page_test_archiver.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 16 matching lines @@
       delayed_(false),
       result_title_(result_title),
       task_runner_(task_runner) {}
 
 OfflinePageTestArchiver::~OfflinePageTestArchiver() {
   EXPECT_TRUE(create_archive_called_);
 }
 
 void OfflinePageTestArchiver::CreateArchive(
     const base::FilePath& archives_dir,
-    int64_t archive_id,
+    const CreateArchiveParams& create_archive_params,
     const CreateArchiveCallback& callback) {
   create_archive_called_ = true;
   callback_ = callback;
   archives_dir_ = archives_dir;
+  create_archive_params_ = create_archive_params;
   if (!delayed_)
     CompleteCreateArchive();
 }
 
 void OfflinePageTestArchiver::CompleteCreateArchive() {
   DCHECK(!callback_.is_null());
   base::FilePath archive_path;
   if (filename_.empty()) {
     ASSERT_TRUE(base::CreateTemporaryFileInDir(archives_dir_, &archive_path));
   } else {
     archive_path = archives_dir_.Append(filename_);
     // This step ensures the file is created and closed immediately.
     base::File file(archive_path, base::File::FLAG_OPEN_ALWAYS);
   }
   observer_->SetLastPathCreatedByArchiver(archive_path);
   task_runner_->PostTask(
       FROM_HERE, base::Bind(callback_, this, result_, url_, archive_path,
                             result_title_, size_to_report_));
 }
 
 }  // namespace offline_pages