Fixes sending the wrong mime-type for scaled resources (.png@2x)

chrome/browser/search/local_ntp_source.cc

 // Copyright 2013 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 "chrome/browser/search/local_ntp_source.h"
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 166 matching lines @@
               kResources[i].identifier, scale_factor));
       callback.Run(response.get());
       return;
     }
   }
   callback.Run(NULL);
 }
 
 std::string LocalNtpSource::GetMimeType(
     const std::string& path) const {
-  const std::string stripped_path = StripParameters(path);
+  const std::string& stripped_path = StripParameters(path);
+  std::string filename;
+  webui::ParsePathAndScale(GURL(GetLocalNtpPath() + stripped_path), &filename,
+                           NULL);
   for (size_t i = 0; i < arraysize(kResources); ++i) {
-    if (stripped_path == kResources[i].filename)
+    if (filename == kResources[i].filename)
       return kResources[i].mime_type;
   }
   return std::string();
 }
 
 bool LocalNtpSource::ShouldServiceRequest(
     const net::URLRequest* request) const {
   DCHECK(request->url().host() == chrome::kChromeSearchLocalNtpHost);
   if (!InstantIOContext::ShouldServiceRequest(request))
     return false;
 
   if (request->url().SchemeIs(chrome::kChromeSearchScheme)) {
     std::string filename;
     webui::ParsePathAndScale(request->url(), &filename, NULL);
     for (size_t i = 0; i < arraysize(kResources); ++i) {
       if (filename == kResources[i].filename)
         return true;
     }
   }
   return false;
 }
 
 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const {
   // Allow embedding of most visited iframes.
   return base::StringPrintf("frame-src %s;",
                             chrome::kChromeSearchMostVisitedUrl);
 }