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

ui/gfx/scoped_image_unittest.cc

 // Copyright (c) 2010 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 "base/scoped_ptr.h"
-#include "gfx/scoped_image.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/scoped_image.h"
 
 #if defined(OS_LINUX)
-#include "gfx/gtk_util.h"
+#include "ui/gfx/gtk_util.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 namespace {
 
 class ScopedImageTest : public testing::Test {
  public:
   SkBitmap* CreateBitmap() {
@@ skipping 67 matching lines @@
 
 TEST_F(ScopedImageTest, NativeSet) {
   gfx::ScopedNativeImage image(CreateNativeImage());
   EXPECT_TRUE(image.Get());
   gfx::NativeImage image2 = CreateNativeImage();
   image.Set(image2);
   EXPECT_EQ(image2, image.Get());
 }
 
 }  // namespace