Merge to M57: Remove popup overlay from MHTML when requested

chrome/browser/android/offline_pages/offline_page_request_job_unittest.cc

 // Copyright 2016 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/browser/android/offline_pages/offline_page_request_job.h"
 
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
@@ skipping 196 matching lines @@
  public:
   TestOfflinePageArchiver(const GURL& url,
                           const base::FilePath& archive_file_path,
                           int archive_file_size)
       : url_(url),
         archive_file_path_(archive_file_path),
         archive_file_size_(archive_file_size) {}
   ~TestOfflinePageArchiver() override {}
 
   void CreateArchive(const base::FilePath& archives_dir,
-                     int64_t archive_id,
+                     const CreateArchiveParams& create_archive_params,
                      const CreateArchiveCallback& callback) override {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(callback, this, ArchiverResult::SUCCESSFULLY_CREATED,
                    url_, archive_file_path_, base::string16(),
                    archive_file_size_));
   }
 
  private:
   const GURL url_;
@@ skipping 669 matching lines @@
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id4(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
   ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK);
   ExpectOpenFileErrorCode(net::ERR_FILE_NOT_FOUND);
 }
 
 }  // namespace offline_pages