Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update c...

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
+#include "app/mac/nsimage_cache.h"
 #include "app/resource_bundle.h"
-#include "base/nsimage_cache_mac.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
@@ skipping 119 matching lines @@
     // Values from |ToolbarModel::GetIcon()|.
     case IDR_OMNIBOX_HTTPS_VALID:
       image_name = @"omnibox_https_valid.pdf"; break;
     case IDR_OMNIBOX_HTTPS_WARNING:
       image_name = @"omnibox_https_warning.pdf"; break;
     case IDR_OMNIBOX_HTTPS_INVALID:
       image_name = @"omnibox_https_invalid.pdf"; break;
   }
 
   if (image_name) {
-    if (NSImage* image = nsimage_cache::ImageNamed(image_name)) {
+    if (NSImage* image = app::mac::GetCachedImageWithName(image_name)) {
       return image;
     } else {
       NOTREACHED()
           << "Missing image for " << base::SysNSStringToUTF8(image_name);
     }
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(resource_id);
 }
@@ skipping 917 matching lines @@
   }
 
   return std::wstring();
 }
 
 // static
 NSFont* AutocompleteEditViewMac::GetFieldFont() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetFont(ResourceBundle::BaseFont).GetNativeFont();
 }