Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

chrome/browser/extensions/extension_action.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #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;
 class Image;
 class ImageSkia;
 class Rect;
 class Size;
 }
 
 // ExtensionAction encapsulates the state of a browser action, page action, or
@@ skipping 60 matching lines @@
     // Construct using ExtensionAction::RunIconAnimation().
     friend class ExtensionAction;
     IconAnimation();
 
     base::WeakPtr<IconAnimation> AsWeakPtr();
 
     // ui::LinearAnimation implementation.
     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_;
 
     base::WeakPtrFactory<IconAnimation> weak_ptr_factory_;
 
     DISALLOW_COPY_AND_ASSIGN(IconAnimation);
   };
 
   ExtensionAction(const std::string& extension_id,
                   extensions::ActionInfo::Type action_type,
@@ skipping 251 matching lines @@
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_