Switch ChromeOS Chromium login to use IJG libjpeg

ui/gfx/codec/jpeg_codec.cc

Index: ui/gfx/codec/jpeg_codec.cc
diff --git a/ui/gfx/codec/jpeg_codec.cc b/ui/gfx/codec/jpeg_codec.cc
index 8a08fe0291afcc8a61c6b4f560396a4a50057da8..007f7e54da56490bc58a676d5d3d357b58f87386 100644
--- a/ui/gfx/codec/jpeg_codec.cc
+++ b/ui/gfx/codec/jpeg_codec.cc
@@ -12,9 +12,9 @@
 #include "third_party/skia/include/core/SkColorPriv.h"
 
 extern "C" {
-#if defined(USE_SYSTEM_LIBJPEG)
+#if defined(USE_SYSTEM_LIBJPEG) && !defined(OS_CHROMEOS)

[Elliot Glaysher, 2014/09/16 18:01:57]

I don't believe that chromeos ever uses USE_SYSTEM_* since it's a linux
desktopism. You can probably drop this and the one below in the library variant
method.

 #include <jpeglib.h>
-#elif defined(USE_LIBJPEG_TURBO)
+#elif defined(USE_LIBJPEG_TURBO) && !defined(OS_CHROMEOS)
 #include "third_party/libjpeg_turbo/jpeglib.h"
 #else
 #include "third_party/libjpeg/jpeglib.h"
@@ -44,9 +44,9 @@ void ErrorExit(jpeg_common_struct* cinfo) {
 
 // This method helps identify at run time which library chromium is using.
 JPEGCodec::LibraryVariant JPEGCodec::JpegLibraryVariant() {
-#if defined(USE_SYSTEM_LIBJPEG)
+#if defined(USE_SYSTEM_LIBJPEG) && !defined(OS_CHROMEOS)
   return SYSTEM_LIBJPEG;
-#elif defined(USE_LIBJPEG_TURBO)
+#elif defined(USE_LIBJPEG_TURBO) && !defined(OS_CHROMEOS)
   return LIBJPEG_TURBO;
 #else
   return IJG_LIBJPEG;