Allow loading MHTML archive from content scheme

third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp

Index: third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp
diff --git a/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp b/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp
index 26fe8ab4d8e1b3b88d67c43482a0c6c3288da1db..9131ef53a18073d115a005e10d464e09507419e3 100644
--- a/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp
+++ b/third_party/WebKit/Source/platform/mhtml/MHTMLArchive.cpp
@@ -69,9 +69,9 @@ MHTMLArchive::MHTMLArchive()
 
 MHTMLArchive* MHTMLArchive::create(const KURL& url, PassRefPtr<SharedBuffer> data)
 {
-    // MHTML pages can only be loaded from local URLs and http/https URLs.
+    // MHTML pages can only be loaded from local URLs, http/https URLs, and content URLs(Android specific).
     // The latter is now allowed due to full sandboxing enforcement on MHTML pages.
-    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol()) && !url.protocolIsInHTTPFamily())
+    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol()) && !url.protocolIsInHTTPFamily() && !canLoadContent(url))

[jianli, 2016/08/17 20:27:21]

I think it would be better to move all these checks into a helper function,
like:
bool MHTMLArchive::canLoadArchive(onst KURL& url)
{
    // MHTML pages can only be loaded ...
    if (SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol())
        return true;
    if (url.protocolIsInHTTPFamily())
        return true;
#if OS(ANDROID)
    if (url.protocolIs("content"))
        return true;
#endif
    return false;
}

[Vivian, 2016/08/17 20:38:17]

Done.

         return nullptr;
 
     MHTMLParser parser(data);
@@ -91,6 +91,14 @@ MHTMLArchive* MHTMLArchive::create(const KURL& url, PassRefPtr<SharedBuffer> dat
     return archive;
 }
 
+bool MHTMLArchive::canLoadContent(const KURL& url)
+{
+#if OS(ANDROID)
+    return url.protocolIs("content");
+#endif
+    return false;
+}
+
 void MHTMLArchive::generateMHTMLHeader(
     const String& boundary, const String& title, const String& mimeType,
     SharedBuffer& outputBuffer)