Introduces a new MHTML generation parameter specifying different behvaior for cache-control headers.

chrome/browser/android/offline_pages/offline_page_mhtml_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 "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "components/security_state/security_state_model.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/mhtml_generation_params.h"
 #include "net/base/filename_util.h"
 
 namespace offline_pages {
 namespace {
 const base::FilePath::CharType kMHTMLExtension[] = FILE_PATH_LITERAL("mhtml");
 const base::FilePath::CharType kDefaultFileName[] =
     FILE_PATH_LITERAL("offline_page");
 const int kTitleLengthMax = 80;
 const char kMHTMLFileNameExtension[] = ".mhtml";
 const char kFileNameComponentsSeparator[] = "-";
@@ skipping 83 matching lines @@
 
   // TODO(fgorski): Figure out if the actual URL can be different at
   // the end of MHTML generation. Perhaps we should pull it out after the MHTML
   // is generated.
   GURL url(web_contents_->GetLastCommittedURL());
   base::string16 title(web_contents_->GetTitle());
   base::FilePath file_path(
       archives_dir.Append(
           GenerateFileName(url, base::UTF16ToUTF8(title), archive_id)));
 
+  content::MHTMLGenerationParams params(file_path);
+  params.cache_control_policy =
+      content::MHTMLCacheControlPolicy::FAIL_FOR_NO_STORE_MAIN_FRAME;
+  params.use_binary_encoding = true;
+
   web_contents_->GenerateMHTML(
-      file_path, true /* use_binary_encoding */,
-      base::Bind(&OfflinePageMHTMLArchiver::OnGenerateMHTMLDone,
-                 weak_ptr_factory_.GetWeakPtr(), url, file_path));
+      params, base::Bind(&OfflinePageMHTMLArchiver::OnGenerateMHTMLDone,
+                         weak_ptr_factory_.GetWeakPtr(), url, file_path));
 }
 
 void OfflinePageMHTMLArchiver::OnGenerateMHTMLDone(
     const GURL& url,
     const base::FilePath& file_path,
     int64_t file_size) {
   if (file_size < 0) {
     ReportFailure(ArchiverResult::ERROR_ARCHIVE_CREATION_FAILED);
   } else {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ skipping 13 matching lines @@
 }
 
 void OfflinePageMHTMLArchiver::ReportFailure(ArchiverResult result) {
   DCHECK(result != ArchiverResult::SUCCESSFULLY_CREATED);
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(callback_, this, result, GURL(), base::FilePath(), 0));
 }
 
 }  // namespace offline_pages