Allow loading MHTML archive from content scheme

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 51 matching lines @@
     }
     return stringBuilder.toString();
 }
 
 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()
+#if (DE_OS == DE_OS_ANDROID)

[jianli, 2016/08/17 01:12:49]

I don't think this is a correct check. You should use:
#if OS(ANDROID)

Also, we should try to avoid span this check in multi-line like this. I suggest
to introduce a helper function like CanLoad to improve readability.

[Vivian, 2016/08/17 17:27:18]

Done.

+        && !url.protocolIs("content")
+#endif
+            )
         return nullptr;
 
     MHTMLParser parser(data);
     HeapVector<Member<ArchiveResource>> resources = parser.parseArchive();
     if (resources.isEmpty())
         return nullptr; // Invalid MHTML file.
 
     MHTMLArchive* archive = new MHTMLArchive;
     // The first document suitable resource is the main resource of the top frame.
     for (size_t i = 0; i < resources.size(); ++i) {
@@ skipping 153 matching lines @@
     return m_subresources.get(url.getString());
 }
 
 DEFINE_TRACE(MHTMLArchive)
 {
     visitor->trace(m_mainResource);
     visitor->trace(m_subresources);
 }
 
 } // namespace blink