Allow MultiResolutionImageFetcher to fetch image from file:/// protocol

content/renderer/fetchers/multi_resolution_image_resource_fetcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/utf_string_conversions.h"
+#include "net/base/mime_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/image_decoder.h"
 
 using WebKit::WebFrame;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
 namespace content {
@@ skipping 18 matching lines @@
   if (!fetcher_->completed())
     fetcher_->Cancel();
 }
 
 void MultiResolutionImageResourceFetcher::OnURLFetchComplete(
     const WebURLResponse& response,
     const std::string& data) {
   std::vector<SkBitmap> bitmaps;
   if (!response.isNull()) {
     http_status_code_ = response.httpStatusCode();
-    if (http_status_code_ == 200) {
+    std::string mime_type = UTF16ToUTF8(response.mimeType());
+    if (http_status_code_ == 200 || (net::IsSupportedImageMimeType(mime_type) &&

[Nico, 2013/06/04 18:01:20]

This will now also let through a partially downloaded ico file over http, no?

+        data.size() > 0)) {
       // Request succeeded, try to convert it to an image.
       bitmaps = webkit_glue::ImageDecoder::DecodeAll(
           reinterpret_cast<const unsigned char*>(data.data()), data.size());
     }
   } // else case:
     // If we get here, it means no image from server or couldn't decode the
     // response as an image. The delegate will see an empty vector.
 
   // Take a reference to the callback as running the callback may lead to our
   // destruction.
   Callback callback = callback_;
   callback.Run(this, bitmaps);
 }
 
 }  // namespace content