Converted the rest of chrome except for extensions and favicons to user ImageSkia

Used same conversion script as 10437006

Modified the following files afterwards:
  1 chrome/browser/background/background_application_list_model.cc
  2 chrome/browser/extensions/extension_install_ui.cc
  3 chrome/browser/extensions/extension_install_ui.h
  4 chrome/browser/speech/speech_recognition_bubble.cc
  5 chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
  6 chrome/browser/speech/speech_recognition_bubble_gtk.cc
  7 chrome/browser/speech/speech_recognition_tray_icon_controller.h
  8 chrome/browser/task_manager/task_manager_resource_providers.cc
  9 chrome/browser/ui/panels/panel_browser_frame_view.cc
 10 chrome/browser/ui/search_engines/template_url_table_model.cc
 11 chrome/browser/ui/search_engines/template_url_table_model.h
 12 chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
 13 chrome/browser/ui/views/avatar_menu_button.cc
 14 chrome/browser/ui/views/detachable_toolbar_view.cc
 15 chrome/browser/ui/views/download/download_item_view.cc
 16 chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
 17 chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
 18 chrome/browser/ui/views/location_bar/location_bar_view.cc
 19 chrome/browser/ui/views/tab_icon_view.cc
 20 chrome/browser/ui/views/tab_icon_view.h
 21 chrome/browser/ui/views/tabs/tab_strip.cc

Include, whitespace changes in
  1 chrome/browser/automation/automation_provider_observers.cc
  2 chrome/browser/background/background_application_list_model.h
  3 chrome/browser/background/background_mode_manager.cc
  4 chrome/browser/custom_home_pages_table_model.h
  5 chrome/browser/download/download_util.cc
  6 chrome/browser/extensions/extension_function_dispatcher.cc
  7 chrome/browser/extensions/extension_install_dialog.cc
  8 chrome/browser/extensions/extension_install_dialog.h
  9 chrome/browser/ntp_background_util.cc
 10 chrome/browser/speech/speech_recognition_bubble.h
 11 chrome/browser/task_manager/task_manager.h
 12 chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc
 13 chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc
 14 chrome/browser/ui/cocoa/task_manager_mac.h
 15 chrome/browser/ui/views/about_chrome_view.cc
 16 chrome/browser/ui/views/avatar_menu_bubble_view.cc
 17 chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
 18 chrome/browser/ui/views/download/download_item_view.h
 19 chrome/browser/ui/views/find_bar_view.cc
 20 chrome/browser/ui/views/infobars/extension_infobar.cc
 21 chrome/browser/ui/views/notifications/balloon_view.cc
 22 chrome/browser/ui/views/page_info_bubble_view.cc
 23 chrome/browser/ui/views/tabs/base_tab.cc
 24 chrome/browser/ui/views/tabs/tab.cc
 25 chrome/browser/ui/views/toolbar_view.cc

Review URL: https://chromiumcodereview.appspot.com/10453101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140531 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc
index c5e286d..c313db6 100644
--- a/chrome/browser/task_manager/task_manager_unittest.cc
+++ b/chrome/browser/task_manager/task_manager_unittest.cc
@@ -12,8 +12,8 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
@@ -36,7 +36,7 @@ class TestResource : public TaskManager::Resource {
   virtual string16 GetProfileName() const OVERRIDE {
     return ASCIIToUTF16("test profile");
   }
-  virtual SkBitmap GetIcon() const { return SkBitmap(); }
+  virtual gfx::ImageSkia GetIcon() const { return gfx::ImageSkia(); }
   virtual base::ProcessHandle GetProcess() const {
     return base::GetCurrentProcessHandle();
   }