Misc. cleanup for theme provider code, including:

* Use correct indentation/alignment in a number of places
* Use early-return to avoid long code block indenting
* Use for() instead of while() in cases where that's what the code is actually doing
* Consistent naming for iterators ("foo_iter", "bar_iter" instead of sometimes that way and sometimes "found")
* Use {} when needed, don't use when not
* Do not use "else" after "return"
* Shorten overly-verbose code
* Pull some trivial functions into the header
* Eliminate unused function
* Use STLDeleteValues() helper where appropriate

Some of this was originally in my patch that modified constness, but I've split it out to make that more sane.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/272033

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

1 files changed, 3 insertions, 5 deletions

diff --git a/chrome/browser/gtk/gtk_theme_provider_unittest.cc b/chrome/browser/gtk/gtk_theme_provider_unittest.cc
index 36ac2db..d479bc6 100644
--- a/chrome/browser/gtk/gtk_theme_provider_unittest.cc
+++ b/chrome/browser/gtk/gtk_theme_provider_unittest.cc
@@ -111,12 +111,10 @@ class ImageVerifierGtkThemeProvider : public GtkThemeProvider {
   ImageVerifierGtkThemeProvider() : theme_toolbar_(NULL) { }
 
   virtual SkBitmap* LoadThemeBitmap(int id) {
-    if (id == IDR_THEME_TOOLBAR) {
-      theme_toolbar_ = GtkThemeProvider::LoadThemeBitmap(id);
-      return theme_toolbar_;
-    } else {
+    if (id != IDR_THEME_TOOLBAR)
       return GtkThemeProvider::LoadThemeBitmap(id);
-    }
+    theme_toolbar_ = GtkThemeProvider::LoadThemeBitmap(id);
+    return theme_toolbar_;
   }
 
   SkBitmap* theme_toolbar_;