Get signals working in the EXTRA_DATA section of MHTML

chrome/browser/android/offline_pages/prerendering_offliner.cc

Index: chrome/browser/android/offline_pages/prerendering_offliner.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_offliner.cc b/chrome/browser/android/offline_pages/prerendering_offliner.cc
index a6564ad078d662af7b164c009e039d8dd89aa383..dc506e665b5a9db510febb1357948f14543de695 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner.cc
@@ -14,10 +14,19 @@
 #include "components/offline_pages/core/background/save_page_request.h"
 #include "components/offline_pages/core/client_namespace_constants.h"
 #include "components/offline_pages/core/downloads/download_ui_adapter.h"
+#include "components/offline_pages/core/offline_page_feature.h"
 #include "components/offline_pages/core/offline_page_model.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/mhtml_extra_parts.h"
 #include "content/public/browser/web_contents.h"
 
+namespace {
+const char kContentType[] = "text/plain";
+const char kContentTransferEncodingBinary[] =
+    "Content-Transfer-Encoding: binary";
+const char kXHeaderForSignals[] = "Chromium-Loading-Metrics-Data: 1";

[Dmitry Titov, 2017/04/05 00:18:06]

that header doesn't look like x-google-... I htink it should literally start
with this.

[Pete Williamson, 2017/04/05 18:29:46]

After discussion offline, we decided to change this to "X-Chrome-...".  There is
guidance on the ietf website to stop using X- headers, but that seems to be for
only things that are likely to become standards someday, and this will be chrome
specific only.

+}  // namespace
+
 namespace offline_pages {
 
 PrerenderingOffliner::PrerenderingOffliner(
@@ -83,6 +92,24 @@ void PrerenderingOffliner::OnLoadPageDone(
     else if (save_page_params.url != request.url())
       save_page_params.original_url = request.url();
 
+    if (IsOfflinePagesLoadSignalCollectingEnabled()) {
+      // Stash loading signals for writing when we write out the MHTML.
+      std::string headers =
+          base::StringPrintf("%s\r\n%s\r\n\r\n", kContentTransferEncodingBinary,
+                             kXHeaderForSignals);

[Dmitry Titov, 2017/04/05 00:18:06]

For the further CL: consider refactoring by adding 'extra_headers' parameter so
they can be passed w/o concatenating with the body... Not necessarily for this
patch.

[Pete Williamson, 2017/04/05 18:29:46]

Acknowledged.

+      std::string body = headers + SerializeLoadingSignalData();
+      std::string content_type = kContentType;
+      std::string content_location = "cid:signal-data-" +
+                                     std::to_string(request.request_id()) +
+                                     "@mhtml.blink";
+
+      content::MHTMLExtraParts* extra_parts =
+          content::MHTMLExtraParts::FromWebContents(web_contents);
+      DCHECK(extra_parts);
+
+      extra_parts->AddExtraMHTMLPart(content_type, content_location, body);
+    }
+
     SavePage(save_page_params, std::move(archiver),
              base::Bind(&PrerenderingOffliner::OnSavePageDone,
                         weak_ptr_factory_.GetWeakPtr(), request));
@@ -94,6 +121,19 @@ void PrerenderingOffliner::OnLoadPageDone(
   }
 }
 
+std::string PrerenderingOffliner::SerializeLoadingSignalData() {
+  // Write the signal data into a single string.
+  std::string signal_string;
+  const std::vector<std::string>& signals = loader_->GetLoadingSignalData();
+
+  // TODO(petewil): Convert this to JSON, use json_writer.h
+  for (std::string signal : signals) {
+    signal_string += signal;
+    signal_string += "\n";
+  }
+  return signal_string;
+}
+
 void PrerenderingOffliner::OnSavePageDone(
     const SavePageRequest& request,
     SavePageResult save_result,