Fix some coverity defects (mostly pass by value).

CID=15414,15415,15413,15412,15402,14582,13684,12723,15407,14785,14511,13975,13647,11655,10891,9103,8402,8394,10924,8497,others
BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/6665012

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

31 files changed, 44 insertions, 42 deletions

diff --git a/chrome/browser/background_application_list_model.cc b/chrome/browser/background_application_list_model.cc
index dbc1dd4..eac372c 100644
--- a/chrome/browser/background_application_list_model.cc
+++ b/chrome/browser/background_application_list_model.cc
@@ -54,7 +54,7 @@ class BackgroundApplicationListModel::Application
 
   // Invoked when a request icon is available.
   virtual void OnImageLoaded(SkBitmap* image,
-                             ExtensionResource resource,
+                             const ExtensionResource& resource,
                              int index);
 
   // Uses the FILE thread to request this extension's icon, sized
@@ -120,7 +120,7 @@ BackgroundApplicationListModel::Application::Application(
 
 void BackgroundApplicationListModel::Application::OnImageLoaded(
     SkBitmap* image,
-    ExtensionResource resource,
+    const ExtensionResource& resource,
     int index) {
   if (!image)
     return;
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index 8709cb7..f3db570 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -79,7 +79,7 @@ void ExtensionIconManager::RemoveIcon(const std::string& extension_id) {
 }
 
 void ExtensionIconManager::OnImageLoaded(SkBitmap* image,
-                                         ExtensionResource resource,
+                                         const ExtensionResource& resource,
                                          int index) {
   if (!image)
     return;
diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h
index e5fc381..41e01c3 100644
--- a/chrome/browser/extensions/extension_icon_manager.h
+++ b/chrome/browser/extensions/extension_icon_manager.h
@@ -34,7 +34,7 @@ class ExtensionIconManager : public ImageLoadingTracker::Observer {
   void RemoveIcon(const std::string& extension_id);
 
   // Implements the ImageLoadingTracker::Observer interface.
-  virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource,
+  virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
                              int index);
 
   void set_monochrome(bool value) { monochrome_ = value; }
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 37f328a..c07d0f6 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -208,7 +208,7 @@ void ExtensionInstallUI::SetIcon(SkBitmap* image) {
 }
 
 void ExtensionInstallUI::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   SetIcon(image);
 
   switch (prompt_type_) {
diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h
index d332f60..eca7ef3 100644
--- a/chrome/browser/extensions/extension_install_ui.h
+++ b/chrome/browser/extensions/extension_install_ui.h
@@ -83,7 +83,7 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
 
   // ImageLoadingTracker::Observer overrides.
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index);
+      SkBitmap* image, const ExtensionResource& resource, int index);
 
   // Show an infobar for a newly-installed theme.  previous_theme_id
   // should be empty if the previous theme was the system/default
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index e2db513..3a91ff2 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -83,7 +83,7 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
     }
   }
 
-  virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource,
+  virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
                              int index) {
     if (image) {
       std::vector<unsigned char> image_data;
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index 5c9d43f..74a9668 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -53,7 +53,8 @@ class ImageLoadingTracker : public NotificationObserver {
     // ExtensionResource where the |image| came from and the |index| represents
     // the index of the image just loaded (starts at 0 and increments every
     // time LoadImage is called).
-    virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource,
+    virtual void OnImageLoaded(SkBitmap* image,
+                               const ExtensionResource& resource,
                                int index) = 0;
   };
 
diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc
index f196b55..ed20d00 100644
--- a/chrome/browser/extensions/image_loading_tracker_unittest.cc
+++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc
@@ -28,7 +28,7 @@ class ImageLoadingTrackerTest : public testing::Test,
         io_thread_(BrowserThread::IO) {
   }
 
-  virtual void OnImageLoaded(SkBitmap* image, ExtensionResource resource,
+  virtual void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
                              int index) {
     image_loaded_count_++;
     if (quit_in_image_loaded_)
diff --git a/chrome/browser/sidebar/sidebar_container.cc b/chrome/browser/sidebar/sidebar_container.cc
index 140dffe..cab6dc2 100644
--- a/chrome/browser/sidebar/sidebar_container.cc
+++ b/chrome/browser/sidebar/sidebar_container.cc
@@ -112,7 +112,7 @@ bool SidebarContainer::IsPopup(const TabContents* source) const {
 }
 
 void SidebarContainer::OnImageLoaded(SkBitmap* image,
-                                     ExtensionResource resource,
+                                     const ExtensionResource& resource,
                                      int index) {
   if (image && use_default_icon_) {
     *icon_ = *image;
diff --git a/chrome/browser/sidebar/sidebar_container.h b/chrome/browser/sidebar/sidebar_container.h
index 9ae2396..658e85e 100644
--- a/chrome/browser/sidebar/sidebar_container.h
+++ b/chrome/browser/sidebar/sidebar_container.h
@@ -117,7 +117,7 @@ class SidebarContainer
 
   // Overridden from ImageLoadingTracker::Observer.
   virtual void OnImageLoaded(SkBitmap* image,
-                             ExtensionResource resource,
+                             const ExtensionResource& resource,
                              int index);
 
   // Returns an extension this sidebar belongs to.
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index 721bcb0..c1fceba 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -65,7 +65,8 @@ class ExtensionImageTrackerBridge : public NotificationObserver,
   ~ExtensionImageTrackerBridge() {}
 
   // ImageLoadingTracker::Observer implementation.
-  void OnImageLoaded(SkBitmap* image, ExtensionResource resource, int index) {
+  void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
+                     int index) {
     if (image)
       [owner_ setDefaultIcon:gfx::SkBitmapToNSImage(*image)];
     [owner_ updateState];
diff --git a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm
index 2a64d7d..2b63b2a 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_infobar_controller.mm
@@ -82,7 +82,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver,
   // TODO(andybons): The infobar view implementations share a lot of the same
   // code. Come up with a strategy to share amongst them.
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index) {
+      SkBitmap* image, const ExtensionResource& resource, int index) {
     if (!delegate_)
       return;  // The delegate can go away while the image asynchronously loads.
 
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
index 13d2cd1..bc91bb7 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
@@ -35,7 +35,7 @@ class PageActionDecoration : public ImageDecoration,
 
   // Overridden from |ImageLoadingTracker::Observer|.
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index);
+      SkBitmap* image, const ExtensionResource& resource, int index);
 
   // Called to notify the Page Action that it should determine whether
   // to be visible or hidden. |contents| is the TabContents that is
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
index c70701c..3c11dec 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm
@@ -111,7 +111,7 @@ bool PageActionDecoration::OnMousePressed(NSRect frame) {
 }
 
 void PageActionDecoration::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   // We loaded icons()->size() icons, plus one extra if the Page Action had
   // a default icon.
   int total_icons = static_cast<int>(page_action_->icon_paths()->size());
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index 62acbaf..0f36121 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -157,7 +157,8 @@ class BrowserActionButton : public NotificationObserver,
   }
 
   // ImageLoadingTracker::Observer implementation.
-  void OnImageLoaded(SkBitmap* image, ExtensionResource resource, int index) {
+  void OnImageLoaded(SkBitmap* image, const ExtensionResource& resource,
+                     int index) {
     if (image) {
       default_skbitmap_ = *image;
       default_icon_ = gfx::GdkPixbufFromSkBitmap(image);
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
index e36908d..a3e07e5 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc
@@ -316,7 +316,7 @@ CreateChromeApplicationShortcutsDialogGtk::
 
 // Called by tracker_ when the app's icon is loaded.
 void CreateChromeApplicationShortcutsDialogGtk::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   if (image->isNull()) {
     NOTREACHED() << "Corrupt image in profile?";
     return;
diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
index 3712c19..647b318 100644
--- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
+++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h
@@ -107,7 +107,7 @@ class CreateChromeApplicationShortcutsDialogGtk
   // load the app's icon.  This method recieves the icon, and adds
   // it to the "Create Shortcut" dailog box.
   virtual void OnImageLoaded(SkBitmap* image,
-                             ExtensionResource resource,
+                             const ExtensionResource& resource,
                              int index);
 
  private:
diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/extension_infobar_gtk.cc
index 23dd6f9..6db9ab6 100644
--- a/chrome/browser/ui/gtk/extension_infobar_gtk.cc
+++ b/chrome/browser/ui/gtk/extension_infobar_gtk.cc
@@ -29,20 +29,19 @@ ExtensionInfoBarGtk::~ExtensionInfoBarGtk() {
 }
 
 void ExtensionInfoBarGtk::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   if (!delegate_)
     return;  // The delegate can go away while we asynchronously load images.
 
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-
-  SkBitmap* icon;
-  if (!image || image->empty())
-    icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
-  else
-    icon = image;
-
-  // TODO(finnur): We now have the icon for the menu button, show the menu
-  // button and layout.
+  // ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  //
+  // SkBitmap* icon;
+  // if (!image || image->empty())
+  //  icon = rb.GetBitmapNamed(IDR_EXTENSIONS_SECTION);
+  // else
+  //  icon = image;
+  // TODO(finnur): Use the above code.
+  // We now have the icon for the menu button, show the menu button and layout.
 }
 
 void ExtensionInfoBarGtk::BuildWidgets() {
diff --git a/chrome/browser/ui/gtk/extension_infobar_gtk.h b/chrome/browser/ui/gtk/extension_infobar_gtk.h
index bb45e45..9c90955 100644
--- a/chrome/browser/ui/gtk/extension_infobar_gtk.h
+++ b/chrome/browser/ui/gtk/extension_infobar_gtk.h
@@ -25,7 +25,7 @@ class ExtensionInfoBarGtk : public InfoBar,
 
   // Overridden from ImageLoadingTracker::Observer:
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index);
+      SkBitmap* image, const ExtensionResource& resource, int index);
 
   // ExtensionViewGtk::Container implementation
   virtual void OnExtensionPreferredSizeChanged(ExtensionViewGtk* view,
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 39d97d7..d742338 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -1542,7 +1542,7 @@ void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility(
 }
 
 void LocationBarViewGtk::PageActionViewGtk::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
   int total_icons = static_cast<int>(page_action_->icon_paths()->size());
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h
index 34ec8b2..53dd180 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h
@@ -232,7 +232,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(
-        SkBitmap* image, ExtensionResource resource, int index);
+        SkBitmap* image, const ExtensionResource& resource, int index);
 
     // Simulate left mouse click on the page action button.
     void TestActivatePageAction();
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 4b2c9258..1021b56 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -114,7 +114,7 @@ void BrowserActionButton::ButtonPressed(views::Button* sender,
 }
 
 void BrowserActionButton::OnImageLoaded(SkBitmap* image,
-                                        ExtensionResource resource,
+                                        const ExtensionResource& resource,
                                         int index) {
   if (image)
     default_icon_ = *image;
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index f9f6e38..1fd6f75 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -83,7 +83,7 @@ class BrowserActionButton : public views::MenuButton,
 
   // Overridden from ImageLoadingTracker.
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index);
+      SkBitmap* image, const ExtensionResource& resource, int index);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc
index ee8a18e9..d935ab7 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.cc
+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -511,7 +511,7 @@ CreateChromeApplicationShortcutView::~CreateChromeApplicationShortcutView() {}
 
 // Called by tracker_ when the app's icon is loaded.
 void CreateChromeApplicationShortcutView::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   if (image->isNull()) {
     NOTREACHED() << "Corrupt image in profile?";
     return;
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h
index e94bea2..f13b9e9 100644
--- a/chrome/browser/ui/views/create_application_shortcut_view.h
+++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -123,7 +123,7 @@ class CreateChromeApplicationShortcutView
   // load the app's icon.  This method recieves the icon, and adds
   // it to the "Create Shortcut" dailog box.
   virtual void OnImageLoaded(SkBitmap* image,
-                             ExtensionResource resource,
+                             const ExtensionResource& resource,
                              int index);
 
  private:
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index b39b477..4b5a4ff 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -137,7 +137,7 @@ void ExtensionInfoBar::OnExtensionPreferredSizeChanged(ExtensionView* view) {
 }
 
 void ExtensionInfoBar::OnImageLoaded(SkBitmap* image,
-                                     ExtensionResource resource,
+                                     const ExtensionResource& resource,
                                      int index) {
   if (!GetDelegate())
     return;  // The delegate can go away while we asynchronously load images.
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.h b/chrome/browser/ui/views/infobars/extension_infobar.h
index b28fde5..67dc3dd 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.h
+++ b/chrome/browser/ui/views/infobars/extension_infobar.h
@@ -41,7 +41,7 @@ class ExtensionInfoBar : public InfoBarView,
 
   // ImageLoadingTracker::Observer:
   virtual void OnImageLoaded(SkBitmap* image,
-                             ExtensionResource resource,
+                             const ExtensionResource& resource,
                              int index);
 
   // ExtensionInfoBarDelegate::DelegateObserver:
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 1e7ca9a..b47c1c1 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -159,7 +159,7 @@ void PageActionImageView::ShowContextMenu(const gfx::Point& p,
 }
 
 void PageActionImageView::OnImageLoaded(
-    SkBitmap* image, ExtensionResource resource, int index) {
+    SkBitmap* image, const ExtensionResource& resource, int index) {
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
   int total_icons = static_cast<int>(page_action_->icon_paths()->size());
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h
index ed0f190..cf91464 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -49,7 +49,7 @@ class PageActionImageView : public views::ImageView,
 
   // Overridden from ImageLoadingTracker.
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index);
+      SkBitmap* image, const ExtensionResource& resource, int index);
 
   // Overridden from ExtensionContextMenuModelModel::Delegate
   virtual void InspectPopup(ExtensionAction* action);
diff --git a/chrome/browser/ui/webui/extension_icon_source.cc b/chrome/browser/ui/webui/extension_icon_source.cc
index 1dd64a2..fa1902f 100644
--- a/chrome/browser/ui/webui/extension_icon_source.cc
+++ b/chrome/browser/ui/webui/extension_icon_source.cc
@@ -233,7 +233,7 @@ void ExtensionIconSource::OnFaviconDataAvailable(
 }
 
 void ExtensionIconSource::OnImageLoaded(SkBitmap* image,
-                                        ExtensionResource resource,
+                                        const ExtensionResource& resource,
                                         int index) {
   int request_id = tracker_map_[index];
   tracker_map_.erase(tracker_map_.find(index));
diff --git a/chrome/browser/ui/webui/extension_icon_source.h b/chrome/browser/ui/webui/extension_icon_source.h
index dfb211f..ce21865 100644
--- a/chrome/browser/ui/webui/extension_icon_source.h
+++ b/chrome/browser/ui/webui/extension_icon_source.h
@@ -107,7 +107,7 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,
 
   // ImageLoadingTracker::Observer
   virtual void OnImageLoaded(SkBitmap* image,
-                             ExtensionResource resource,
+                             const ExtensionResource& resource,
                              int id);
 
   // Called when the extension doesn't have an icon. We fall back to multiple