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

chrome/browser/browser_theme_provider_mac.mm

 // 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"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/gfx/color_utils.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 
 }
 
 NSImage* BrowserThemeProvider::GetNSImageNamed(int id) {
   DCHECK(CalledOnValidThread());
 
   if (!HasCustomImage(id))
     return nil;
 
   // Check to see if we already have the image in the cache.
-  NSImageMap::const_iterator found = nsimage_cache_.find(id);
-  if (found != nsimage_cache_.end())
-    return found->second;
+  NSImageMap::const_iterator nsimage_iter = nsimage_cache_.find(id);
+  if (nsimage_iter != nsimage_cache_.end())
+    return nsimage_iter->second;
 
   // Why don't we load the file directly into the image instead of the whole
   // SkBitmap > native conversion?
   // - For consistency with other platforms.
   // - To get the generated tinted images.
   SkBitmap* bitmap = GetBitmapNamed(id);
   NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap);
 
   // We loaded successfully.  Cache the image.
   if (nsimage) {
@@ skipping 17 matching lines @@
     [empty_image unlockFocus];
   }
 
   return empty_image;
 }
 
 NSColor* BrowserThemeProvider::GetNSColor(int id) {
   DCHECK(CalledOnValidThread());
 
   // Check to see if we already have the color in the cache.
-  NSColorMap::const_iterator found = nscolor_cache_.find(id);
-  if (found != nscolor_cache_.end())
-    return found->second;
+  NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
+  if (nscolor_iter != nscolor_cache_.end())
+    return nscolor_iter->second;
 
   SkColor sk_color = GetColor(id);
   NSColor* color = [NSColor
       colorWithCalibratedRed:SkColorGetR(sk_color)/255.0
                        green:SkColorGetG(sk_color)/255.0
                         blue:SkColorGetB(sk_color)/255.0
                        alpha:SkColorGetA(sk_color)/255.0];
 
   // We loaded successfully.  Cache the color.
   if (color) {
     nscolor_cache_[id] = [color retain];
     return color;
   }
 
   return nil;
 }
 
 NSColor* BrowserThemeProvider::GetNSColorTint(int id) {
   DCHECK(CalledOnValidThread());
 
   // Check to see if we already have the color in the cache.
-  NSColorMap::const_iterator found = nscolor_cache_.find(id);
-  if (found != nscolor_cache_.end())
-    return found->second;
+  NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
+  if (nscolor_iter != nscolor_cache_.end())
+    return nscolor_iter->second;
 
   TintMap::iterator tint_iter = tints_.find(GetTintKey(id));
   if (tint_iter != tints_.end()) {
     color_utils::HSL tint = tint_iter->second;
     CGFloat hue, saturation, brightness;
     HSLToHSB(tint, &hue, &saturation, &brightness);
 
     NSColor* tint_color = [NSColor colorWithCalibratedHue:hue
                                                saturation:saturation
                                                brightness:brightness
@@ skipping 19 matching lines @@
   }
   nsimage_cache_.clear();
 
   // Free colors.
   for (NSColorMap::iterator i = nscolor_cache_.begin();
        i != nscolor_cache_.end(); i++) {
     [i->second release];
   }
   nscolor_cache_.clear();
 }