Change includes of gfx/* to ui/gfx/*

tools/imagediff/image_diff.cc

 // Copyright (c) 2009 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.
 
 // This file input format is based loosely on
 // Tools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
 
 #include <algorithm>
 #include <vector>
 #include <string>
 #include <iostream>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/codec/png_codec.h"
+#include "ui/gfx/codec/png_codec.h"
 
 #if defined(OS_WIN)
 #include "windows.h"
 #endif
 
 // Causes the app to remain open, waiting for pairs of filenames on stdin.
 // The caller is then responsible for terminating this app.
 static const char kOptionPollStdin[] = "use-stdin";
 static const char kOptionGenerateDiff[] = "diff";
 
@@ skipping 335 matching lines @@
                         FilePath(args[1]),
                         FilePath(args[2]));
     }
   } else if (args.size() == 2) {
     return CompareImages(FilePath(args[0]), FilePath(args[1]));
   }
 
   PrintHelp();
   return kStatusError;
 }