Adds a feature to MHTML serialization that omits subframes and subresources marked no-store.

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"
@@ skipping 103 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.cache_control_policy = blink::WebFrameSerializerCacheControlPolicy::
+      SkipAnyFrameOrResourceMarkedNoStore;
   params.use_binary_encoding = true;
 
   web_contents_->GenerateMHTML(
       params, base::Bind(&OfflinePageMHTMLArchiver::OnGenerateMHTMLDone,
                          weak_ptr_factory_.GetWeakPtr(), url, file_path));
 }
 
 void OfflinePageMHTMLArchiver::OnGenerateMHTMLDone(
     const GURL& url,
     const base::FilePath& file_path,
@@ skipping 18 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