Force avatar and wallpaper decoding to use robust JPEG.

chrome/browser/image_decoder.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 "chrome/browser/image_decoder.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 
 using content::BrowserThread;
 using content::UtilityProcessHost;
 
 ImageDecoder::ImageDecoder(Delegate* delegate,
-                           const std::string& image_data)
+                           const std::string& image_data,
+                           bool require_standard_jpeg)
     : delegate_(delegate),
       image_data_(image_data.begin(), image_data.end()),
+      require_standard_jpeg_(require_standard_jpeg),
       target_thread_id_(BrowserThread::UI) {
 }
 
 ImageDecoder::~ImageDecoder() {}
 
 void ImageDecoder::Start() {
   if (!BrowserThread::GetCurrentThreadIdentifier(&target_thread_id_)) {
     NOTREACHED();
     return;
   }
@@ skipping 25 matching lines @@
   if (delegate_)
     delegate_->OnDecodeImageFailed(this);
 }
 
 void ImageDecoder::DecodeImageInSandbox(
     const std::vector<unsigned char>& image_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   UtilityProcessHost* utility_process_host = UtilityProcessHost::Create(
       this, target_thread_id_);
   utility_process_host->EnableZygote();
-  utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data));
+  if(require_standard_jpeg_) {

[oshima, 2012/08/29 00:02:48]

space after if

+    utility_process_host->Send(
+        new ChromeUtilityMsg_DecodeImageWithStandardJPEG(image_data));
+  }
+  else {

[oshima, 2012/08/29 00:02:48]

} else {

+    utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data));
+  }
 }