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

chrome/browser/browser_theme_provider_gtk.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 "chrome/browser/browser_theme_provider.h"
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 GdkPixbuf* BrowserThemeProvider::GetPixbufNamed(int id) {
   return GetPixbufImpl(id, false);
 }
 
 GdkPixbuf* BrowserThemeProvider::GetRTLEnabledPixbufNamed(int id) {
   return GetPixbufImpl(id, true);
 }
 
 GdkPixbuf* BrowserThemeProvider::GetPixbufImpl(int id, bool rtl_enabled) {
   DCHECK(CalledOnValidThread());
   // Use the negative |resource_id| for the key for BIDI-aware images.
   int key = rtl_enabled ? -id : id;
 
   // Check to see if we already have the pixbuf in the cache.
-  GdkPixbufMap::const_iterator found = gdk_pixbufs_.find(key);
-  if (found != gdk_pixbufs_.end())
-    return found->second;
+  GdkPixbufMap::const_iterator pixbufs_iter = gdk_pixbufs_.find(key);
+  if (pixbufs_iter != gdk_pixbufs_.end())
+    return pixbufs_iter->second;
 
   SkBitmap* bitmap = GetBitmapNamed(id);
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
 
   // We loaded successfully.  Cache the pixbuf.
   if (pixbuf) {
     if ((l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) &&
         rtl_enabled) {
       GdkPixbuf* original_pixbuf = pixbuf;
       pixbuf = gdk_pixbuf_flip(pixbuf, TRUE);
@@ skipping 24 matching lines @@
 void BrowserThemeProvider::FreePlatformCaches() {
   DCHECK(CalledOnValidThread());
 
   // Free GdkPixbufs.
   for (GdkPixbufMap::iterator i = gdk_pixbufs_.begin();
        i != gdk_pixbufs_.end(); i++) {
     g_object_unref(i->second);
   }
   gdk_pixbufs_.clear();
 }