Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/omnibox/omnibox_edit_unittest.cc

 // 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #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;
 
 namespace {
 
 class TestingOmniboxView : public OmniboxView {
  public:
   TestingOmniboxView() : OmniboxView(NULL, NULL, NULL, NULL) {}
 
   virtual void SaveStateToTab(WebContents* tab) OVERRIDE {}
@@ skipping 62 matching lines @@
   TestingOmniboxEditController() {}
   virtual void OnAutocompleteAccept(const GURL& url,
                                     WindowOpenDisposition disposition,
                                     content::PageTransition transition,
                                     const GURL& alternate_nav_url) OVERRIDE {}
   virtual void OnChanged() OVERRIDE {}
   virtual void OnSelectionBoundsChanged() OVERRIDE {}
   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 {
     return NULL;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController);
 };
 
@@ skipping 65 matching lines @@
     GURL url;
     bool write_url;
     model.AdjustTextForCopy(input[i].sel_start, input[i].is_all_selected,
                             &result, &url, &write_url);
     EXPECT_EQ(ASCIIToUTF16(input[i].expected_output), result) << "@: " << i;
     EXPECT_EQ(input[i].write_url, write_url) << " @" << i;
     if (write_url)
       EXPECT_EQ(input[i].expected_url, url.spec()) << " @" << i;
   }
 }