8 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index 23a3384..2ea15fe 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -10,7 +10,6 @@
 #include <queue>
 #include <string>
 
-#include "app/surface/transport_dib.h"
 #include "base/platform_file.h"
 #include "base/process.h"
 #include "base/scoped_callback_factory.h"
@@ -22,6 +21,7 @@
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
+#include "ui/gfx/surface/transport_dib.h"
 
 class CommandLine;
 class RendererMainThread;
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index a63de41..40ddd67 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -6,7 +6,6 @@
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
-#include "app/surface/io_surface_support_mac.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ -43,6 +42,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/gfx/gl/gl_switches.h"
+#include "ui/gfx/surface/io_surface_support_mac.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
index 0e00f4e..3ae9ec1 100644
--- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
+++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/history/top_sites.h"
@@ -17,6 +16,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/surface/transport_dib.h"
 
 static const int kBitmapWidth = 100;
 static const int kBitmapHeight = 100;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f771b5f..58df726 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -43,6 +43,7 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
+        '../ui/gfx/surface/surface.gyp:surface',
         '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:blob',
         '../webkit/support/webkit_support.gyp:database',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 9bb0139..1b7163e 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -25,6 +25,7 @@
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '../ui/gfx/surface/surface.gyp:surface',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:webkit_gpu',
         '../webkit/support/webkit_support.gyp:webkit_resources',
diff --git a/chrome/renderer/mock_render_process.cc b/chrome/renderer/mock_render_process.cc
index a93084d..cb4c184 100644
--- a/chrome/renderer/mock_render_process.cc
+++ b/chrome/renderer/mock_render_process.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/renderer/mock_render_process.h"
 
-#include "app/surface/transport_dib.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/surface/transport_dib.h"
 
 MockRenderProcess::MockRenderProcess()
     : transport_dib_next_sequence_number_(0) {
diff --git a/chrome/renderer/nacl_desc_wrapper_chrome.cc b/chrome/renderer/nacl_desc_wrapper_chrome.cc
index a4efc70..eb142993 100644
--- a/chrome/renderer/nacl_desc_wrapper_chrome.cc
+++ b/chrome/renderer/nacl_desc_wrapper_chrome.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "app/surface/transport_dib.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
+#include "ui/gfx/surface/transport_dib.h"
 
 namespace nacl {
 
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 9d63c77..917b3f6 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -12,7 +12,6 @@
 
 #include "chrome/renderer/render_process_impl.h"
 
-#include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ -34,6 +33,7 @@
 #include "media/base/media.h"
 #include "media/base/media_switches.h"
 #include "skia/ext/platform_canvas.h"
+#include "ui/gfx/surface/transport_dib.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"