Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/omnibox/omnibox_edit_unittest.cc

Index: chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
index e061a3a5c12258d6399b15c27eaf55195066a877..28eb76150adb5d4f3f2dc9f690e6611d033c5512 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
@@ -11,8 +11,8 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/image/image.h"
 
 using content::WebContents;
 
@@ -95,7 +95,7 @@ class TestingOmniboxEditController : public OmniboxEditController {
   virtual void OnInputInProgress(bool in_progress) OVERRIDE {}
   virtual void OnKillFocus() OVERRIDE {}
   virtual void OnSetFocus() OVERRIDE {}
-  virtual SkBitmap GetFavicon() const OVERRIDE { return SkBitmap(); }
+  virtual gfx::Image GetFavicon() const OVERRIDE { return gfx::Image(); }
   virtual string16 GetTitle() const OVERRIDE { return string16(); }
   virtual InstantController* GetInstant() OVERRIDE { return NULL; }
   virtual TabContents* GetTabContents() const OVERRIDE {