Misc. cleanup for theme provider code, including:...

chrome/browser/gtk/gtk_theme_provider_unittest.cc

 // Copyright (c) 2009 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 <gtk/gtk.h>
 
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
@@ skipping 92 matching lines @@
   EXPECT_EQ(provider_->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT),
             GdkToSkColor(&label_color));
 }
 
 // Helper class to GtkThemeProviderTest.UsingGtkFrame.
 class ImageVerifierGtkThemeProvider : public GtkThemeProvider {
  public:
   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_;
 };
 
 TEST_F(GtkThemeProviderTest, InjectsToolbar) {
   SetUseGtkTheme(true);
   ImageVerifierGtkThemeProvider* verifier_provider =
       new ImageVerifierGtkThemeProvider;
   UseThemeProvider(verifier_provider);
 
   // Make sure the image we get from the public BrowserThemeProvider interface
   // is the one we injected through GtkThemeProvider.
   SkBitmap* image = provider_->GetBitmapNamed(IDR_THEME_TOOLBAR);
   EXPECT_TRUE(verifier_provider->theme_toolbar_);
   EXPECT_TRUE(image);
   EXPECT_EQ(verifier_provider->theme_toolbar_, image);
 }