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

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index de78df1b008a679665336147ce250c5ad9bf3a98..45f331bb33cf7be1f87518be7bca344795e5e012 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -4,6 +4,7 @@
 
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
+#include <type_traits>

[Łukasz Anforowicz, 2016/05/12 18:56:48]

I don't think this is needed?

[dewittj, 2016/05/12 22:58:01]

Done.

 #include <utility>
 
 #include "base/bind.h"
@@ -76,6 +77,7 @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/isolated_world_ids.h"
+#include "content/public/common/mhtml_generation.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "ui/accessibility/ax_tree.h"
@@ -1841,10 +1843,10 @@ void RenderFrameHostImpl::OnDidChangeLoadProgress(double load_progress) {
 
 void RenderFrameHostImpl::OnSerializeAsMHTMLResponse(
     int job_id,
-    bool success,
+    MHTMLSerializationResult result,
     const std::set<std::string>& digests_of_uris_of_serialized_resources) {
   MHTMLGenerationManager::GetInstance()->OnSerializeAsMHTMLResponse(
-      this, job_id, success, digests_of_uris_of_serialized_resources);
+      this, job_id, result, digests_of_uris_of_serialized_resources);
 }
 
 #if defined(OS_MACOSX) || defined(OS_ANDROID)