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 52 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.
     // The latter is now allowed due to full sandboxing enforcement on MHTML pages.

[jianli, 2016/08/15 23:12:02]

Please also update comment.

[Vivian, 2016/08/16 21:00:44]

Done.

-    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol()) && !url.protocolIsInHTTPFamily())
+    if (!SchemeRegistry::shouldTreatURLSchemeAsLocal(url.protocol()) && !url.protocolIsInHTTPFamily() && !url.protocolIsContent())

[jianli, 2016/08/15 23:12:02]

The check for content protocol should only be for Android platform.

[Vivian, 2016/08/16 21:00:44]

Done.

         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