Rename internal gfx::Image members to be less confusing with Cocoa types.

ui/base/resource/resource_bundle_mac.mm

 // Copyright (c) 2011 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 "ui/base/resource/resource_bundle.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 53 matching lines @@
 
   return GetResourcesPakFilePath(@"locale", mac_locale);
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
   // Check to see if the image is already in the cache.
   {
     base::AutoLock lock(*lock_);
     ImageMap::const_iterator found = images_.find(resource_id);
     if (found != images_.end()) {
-      if (!found->second->HasRepresentation(gfx::Image::kNSImageRep)) {
+      if (!found->second->HasRepresentation(gfx::Image::kImageRepCocoa)) {
         DLOG(WARNING) << "ResourceBundle::GetNativeImageNamed() is returning a"
           << " cached gfx::Image that isn't backed by an NSImage. The image"
           << " will be converted, rather than going through the NSImage loader."
           << " resource_id = " << resource_id;
       }
       return *found->second;
     }
   }
 
   // Load the raw data from the resource pack.
@@ skipping 35 matching lines @@
     images_[resource_id] = image;
     return *image;
   }
 
   LOG(WARNING) << "Unable to load image with id " << resource_id;
   NOTREACHED();  // Want to assert in debug mode.
   return *GetEmptyImage();
 }
 
 }  // namespace ui