Try again to rename one SkJpegUtility.h to remove ambiguity.

This time rename the new codec one, which is not referenced externally.

BUG=skia:

Review URL: https://codereview.chromium.org/1181093008

gyp/codec.gyp

@@ -40,7 +40,7 @@
         '../src/codec/SkGifInterlaceIter.cpp',
         '../src/codec/SkJpegCodec.cpp',
         '../src/codec/SkJpegDecoderMgr.cpp',
-        '../src/codec/SkJpegUtility.cpp',
+        '../src/codec/SkJpegUtility_codec.cpp',
         '../src/codec/SkMaskSwizzler.cpp',
         '../src/codec/SkMasks.cpp',
         '../src/codec/SkSwizzler.cpp',

src/codec/SkJpegCodec.cpp

@@ -8,7 +8,7 @@
 #include "SkCodec.h"
 #include "SkJpegCodec.h"
 #include "SkJpegDecoderMgr.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
 #include "SkStream.h"

src/codec/SkJpegCodec.h

@@ -11,7 +11,7 @@
 #include "SkCodec.h"
 #include "SkImageInfo.h"
 #include "SkJpegDecoderMgr.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 #include "SkStream.h"
 
 extern "C" {

src/codec/SkJpegDecoderMgr.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkJpegDecoderMgr.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 
 /*
  * Print information, warning, and error messages

src/codec/SkJpegDecoderMgr.h

@@ -10,7 +10,7 @@
 
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 #include "SkSwizzler.h"
 #include "SkTemplates.h"
 

src/codec/SkJpegUtility_codec.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "SkCodecPriv.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_codec.h"
 
 /*
  * Initialize the source manager

src/codec/SkJpegUtility_codec.h

@@ -6,8 +6,8 @@
  */
 
 
-#ifndef SkJpegUtility_DEFINED
-#define SkJpegUtility_DEFINED
+#ifndef SkJpegUtility_codec_DEFINED
+#define SkJpegUtility_codec_DEFINED
 
 #include "SkStream.h"