7 files changed, 10 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 523bd83..01cd638 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -8,7 +8,6 @@
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/bitmap_platform_device.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/icu_util.h"
@@ -22,6 +21,7 @@
 #include "net/base/mime_util.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_filter.h"
+#include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index eac2e02f..5b41439 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -12,7 +12,6 @@
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/command_line.h"
-#include "base/gfx/bitmap_platform_device.h"
 #include "base/memory_debug.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -24,6 +23,7 @@
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request_file_job.h"
+#include "skia/ext/bitmap_platform_device.h"
 #include "webkit/glue/webdatasource.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 1f95274..9673f2f 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -6,10 +6,10 @@
 
 #include "webkit/tools/test_shell/webview_host.h"
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webview.h"
 
diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc
index 3713b3f..5b13a7b 100644
--- a/webkit/tools/test_shell/webview_host_win.cc
+++ b/webkit/tools/test_shell/webview_host_win.cc
@@ -4,10 +4,10 @@
 
 #include "webkit/tools/test_shell/webview_host.h"
 
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webview.h"
 
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index 3cb400a..cb6c3f1 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -7,9 +7,9 @@
 
 #include "base/basictypes.h"
 #include "base/gfx/native_widget_types.h"
-#include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "skia/ext/platform_canvas.h"
 
 class WebWidget;
 class WebWidgetDelegate;
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 23d8d8a..08e8753 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -8,9 +8,9 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
-#include "base/gfx/platform_canvas_linux.h"
-#include "base/gfx/platform_device_linux.h"
-#include "base/gfx/bitmap_platform_device_linux.h"
+#include "skia/ext/bitmap_platform_device_linux.h"
+#include "skia/ext/platform_canvas_linux.h"
+#include "skia/ext/platform_device_linux.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"
 
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index 5c384a5..6783b91 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -4,11 +4,11 @@
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-#include "base/gfx/platform_canvas.h"
-#include "base/gfx/platform_canvas_win.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "skia/ext/platform_canvas.h"
+#include "skia/ext/platform_canvas_win.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"