Move app/mac/ files to ui/gfx/mac/ directory.

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.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 "app/mac/nsimage_cache.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/mac/nsimage_cache.h"
 
 // Simple class to remember how many mouseEntered: and mouseExited:
 // calls it gets.  Only used by BookmarkMouseForwarding but placed
 // at the top of the file to keep it outside the anon namespace.
 @interface ButtonRemembersMouseEnterExit : NSButton {
  @public
   int enters_;
   int exits_;
 }
 @end
@@ skipping 33 matching lines @@
 // Make sure icon-only buttons are squeezed tightly.
 TEST_F(BookmarkButtonCellTest, IconOnlySqueeze) {
   NSRect frame = NSMakeRect(0, 0, 50, 30);
   scoped_nsobject<NSButton> view([[NSButton alloc] initWithFrame:frame]);
   scoped_nsobject<BookmarkButtonCell> cell(
       [[BookmarkButtonCell alloc] initTextCell:@"Testing"]);
   [view setCell:cell.get()];
   [[test_window() contentView] addSubview:view];
 
   scoped_nsobject<NSImage> image(
-      [app::mac::GetCachedImageWithName(@"nav.pdf") retain]);
+      [gfx::GetCachedImageWithName(@"nav.pdf") retain]);
   EXPECT_TRUE(image.get());
 
   NSRect r = NSMakeRect(0, 0, 100, 100);
   [cell setBookmarkCellText:@"  " image:image];
   CGFloat two_space_width = [cell.get() cellSizeForBounds:r].width;
   [cell setBookmarkCellText:@" " image:image];
   CGFloat one_space_width = [cell.get() cellSizeForBounds:r].width;
   [cell setBookmarkCellText:@"" image:image];
   CGFloat zero_space_width = [cell.get() cellSizeForBounds:r].width;
 
@@ skipping 93 matching lines @@
   EXPECT_GE(size.width, 2);
   EXPECT_GE(size.height, 2);
 
   // Once we turn on arrow drawing make sure there is now room for it.
   [cell setDrawFolderArrow:YES];
   NSSize arrowSize = [cell cellSize];
   EXPECT_GT(arrowSize.width, size.width);
 }
 
 }  // namespace