Validate generated MHTML in mhtml_generation_browsertest.cc tests.

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index a9aa01e650b5749678a56564d80a243c294be77f..04ca91e439845739055e735f52cd4a6325517630 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -1157,10 +1157,24 @@ void ResourceFetcher::WarnUnusedPreloads() {
 
 ArchiveResource* ResourceFetcher::CreateArchive(Resource* resource) {
   // Only the top-frame can load MHTML.
-  if (!Context().IsMainFrame())
+  if (!Context().IsMainFrame()) {
+    Context().AddConsoleMessage(
+        "Attempt to load a multipart archive into an subframe: " +

[Nate Chapin, 2017/05/16 22:55:33]

Attempt->Attempted ?

[carlosk, 2017/05/17 00:42:51]

Done.

+            resource->Url().GetString(),
+        FetchContext::kLogErrorMessage);
     return nullptr;
+  }
+
   archive_ = MHTMLArchive::Create(resource->Url(), resource->ResourceBuffer());
-  return archive_ ? archive_->MainResource() : nullptr;
+  if (!archive_) {
+    // Log if attempting to load an invalid archive resource.
+    Context().AddConsoleMessage(
+        "Malformed multipart archive: " + resource->Url().GetString(),
+        FetchContext::kLogErrorMessage);
+    return nullptr;
+  }
+
+  return archive_->MainResource();
 }
 
 ResourceTimingInfo* ResourceFetcher::GetNavigationTimingInfo() {