Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

chrome/browser/extensions/extension_action.h

Index: chrome/browser/extensions/extension_action.h
diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h
index 943a3eb4ab96f5396c56df700af56b781c3d619a..c7f1fac5e67e75b217f187e13019e37750782604 100644
--- a/chrome/browser/extensions/extension_action.h
+++ b/chrome/browser/extensions/extension_action.h
@@ -18,11 +18,12 @@
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "third_party/skia/include/core/SkColor.h"
+// TODO(robertphillips): change this to "class SkBaseDevice;"
+#include "third_party/skia/include/core/SkDevice.h"
 #include "ui/base/animation/linear_animation.h"
 
 class GURL;
 class SkBitmap;
-class SkDevice;
 
 namespace gfx {
 class Canvas;
@@ -103,7 +104,7 @@ class ExtensionAction {
     virtual void AnimateToState(double state) OVERRIDE;
 
     // Device we use to paint icons to.
-    mutable scoped_ptr<SkDevice> device_;
+    mutable scoped_ptr<SkBaseDevice> device_;
 
     ObserverList<Observer> observers_;