Enable robust decoding of custom wallpaper and allow custom wallpaper on login page

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 344 matching lines @@
       metafile.FinishPage();
     }
   }
   metafile.FinishDocument();
   return ret;
 }
 #endif  // defined(OS_WIN)
 
 void ChromeContentUtilityClient::OnRobustJPEGDecodeImage(
     const std::vector<unsigned char>& encoded_data) {
-  scoped_ptr<SkBitmap> decoded_image(gfx::JPEGCodec::Decode(
-      &encoded_data[0], encoded_data.size()));
-  if (decoded_image->empty()) {
+  // Our robust jpeg decoding is using IJG libjpeg.
+  if (gfx::JPEGCodec::JpegLibraryVariant() == gfx::JPEGCodec::IJG_LIBJPEG) {
+    scoped_ptr<SkBitmap> decoded_image(gfx::JPEGCodec::Decode(
+        &encoded_data[0], encoded_data.size()));
+    if (!decoded_image.get() || decoded_image->empty()) {
+      Send(new ChromeUtilityHostMsg_DecodeImage_Failed());
+    } else {
+      Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(*decoded_image));
+    }
+  } else {
     Send(new ChromeUtilityHostMsg_DecodeImage_Failed());
-  } else {
-    Send(new ChromeUtilityHostMsg_DecodeImage_Succeeded(*decoded_image));
   }
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 void ChromeContentUtilityClient::OnParseJSON(const std::string& json) {
   int error_code;
   std::string error;
   Value* value = base::JSONReader::ReadAndReturnError(
       json, base::JSON_PARSE_RFC, &error_code, &error);
   if (value) {
@@ skipping 22 matching lines @@
   } else
 #endif
   {
     Send(new ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed(
         printer_name));
   }
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace chrome