10 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 5bc0e9b..ff87093 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -9,7 +9,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/vector_canvas.h"
 #include "base/histogram.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc
index b5eecb3..f6e783c 100644
--- a/chrome/browser/printing/printed_document.cc
+++ b/chrome/browser/printing/printed_document.cc
@@ -6,7 +6,6 @@
 
 #include <set>
 
-#include "base/gfx/platform_device_win.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/printing/page_number.h"
@@ -20,6 +19,7 @@
 #include "chrome/common/time_format.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
+#include "skia/ext/platform_device.h"
 
 using base::Time;
 
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index e8ac2e2..213e199 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -5,7 +5,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/platform_device_win.h"
+#include "skia/ext/platform_device.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/time.h"
diff --git a/chrome/browser/printing/win_printing_context.cc b/chrome/browser/printing/win_printing_context.cc
index f4343ff..8fb9c28 100644
--- a/chrome/browser/printing/win_printing_context.cc
+++ b/chrome/browser/printing/win_printing_context.cc
@@ -7,10 +7,10 @@
 #include <winspool.h>
 
 #include "base/file_util.h"
-#include "base/gfx/platform_device_win.h"
 #include "base/time_format.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
+#include "skia/ext/platform_device_win.h"
 
 using base::Time;
 
diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc
index df5fb3c..710e1ee 100644
--- a/chrome/browser/views/theme_helpers.cc
+++ b/chrome/browser/views/theme_helpers.cc
@@ -8,9 +8,9 @@
 #include <atlapp.h>
 #include <atltheme.h>
 
-#include "base/gfx/bitmap_platform_device_win.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "base/logging.h"
+#include "skia/ext/bitmap_platform_device_win.h"
 #include "SkGradientShader.h"
 
 void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2) {
diff --git a/chrome/common/gfx/chrome_canvas.h b/chrome/common/gfx/chrome_canvas.h
index ddc3f28..313f5db 100644
--- a/chrome/common/gfx/chrome_canvas.h
+++ b/chrome/common/gfx/chrome_canvas.h
@@ -7,8 +7,9 @@
 
 #include <windows.h>
 #include <string>
+
 #include "base/basictypes.h"
-#include "base/gfx/platform_canvas_win.h"
+#include "skia/ext/platform_canvas_win.h"
 
 class ChromeFont;
 namespace gfx {
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 91df155..11703b6 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/time.h"
-#include "base/gfx/platform_device_win.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/plugin_messages.h"
@@ -17,6 +16,7 @@
 #include "chrome/plugin/webplugin_proxy.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
+#include "skia/ext/platform_device.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
 
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 255c843..7ab78629 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -5,7 +5,6 @@
 #include "chrome/plugin/webplugin_proxy.h"
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/platform_device_win.h"
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "base/singleton.h"
@@ -16,6 +15,7 @@
 #include "chrome/plugin/webplugin_delegate_stub.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/npobject_util.h"
+#include "skia/ext/platform_device.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 3c041cb..3fd05d1 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -10,10 +10,8 @@
 
 #include "base/command_line.h"
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/bitmap_platform_device_win.h"
 #include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/vector_canvas.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
@@ -39,6 +37,8 @@
 #include "chrome/views/message_box_view.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
+#include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/vector_canvas.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/dom_serializer.h"
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index c94f769..40aee5f 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -10,9 +10,9 @@
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/gfx/platform_canvas_win.h"
 #include "base/scoped_ptr.h"
 #include "chrome/renderer/render_process.h"
+#include "skia/ext/platform_canvas_win.h"
 
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"