Convert most of the rest of chrome to ImageSkia

chrome/browser/chrome_browser_main.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 "chrome/browser/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 374 matching lines @@
   NOTIMPLEMENTED();
 #else
   // Ideally, we should be able to run w/o access to disk.  For now, we
   // prompt the user to pick a different user-data-dir and restart chrome
   // with the new dir.
   // http://code.google.com/p/chromium/issues/detail?id=11510
   FilePath new_user_data_dir = browser::ShowUserDataDirDialog(user_data_dir);
   if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) {
     // Only delete the resources if we're not running tests. If we're running
     // tests the resources need to be reused as many places in the UI cache
-    // SkBitmaps from the ResourceBundle.
+    // ImageSkias from the ResourceBundle.
     ResourceBundle::CleanupSharedInstance();
   }
 
   if (!new_user_data_dir.empty()) {
     // Because of the way CommandLine parses, it's sufficient to append a new
     // --user-data-dir switch.  The last flag of the same name wins.
     // TODO(tc): It would be nice to remove the flag we don't want, but that
     // sounds risky if we parse differently than CommandLineToArgvW.
     CommandLine new_command_line = parameters.command_line;
     new_command_line.AppendSwitchPath(switches::kUserDataDir,
@@ skipping 1599 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }