Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/image/image_mac_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/base/cocoa/menu_controller.mm ('K') | « ui/gfx/image/image_mac.mm ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | ui/message_center/cocoa/popup_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_mac_unittest.mm
diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm
index 7a0c3eb087c42c5d66dd7b6be6d1389a7d32448e..250deeb5249b406f18a9d572c3c343d7752cad09 100644
--- a/ui/gfx/image/image_mac_unittest.mm
+++ b/ui/gfx/image/image_mac_unittest.mm
@@ -5,7 +5,7 @@
#include <Cocoa/Cocoa.h>
#include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_png_rep.h"
@@ -99,7 +99,7 @@ TEST_F(ImageMacTest, MultiResolutionNSImageToImageSkia) {
BitmapImageRep(kWidth1x, kHeight1x, &ns_image_rep1);
NSBitmapImageRep* ns_image_rep2;
BitmapImageRep(kWidth2x, kHeight2x, &ns_image_rep2);
- scoped_nsobject<NSImage> ns_image(
+ base::scoped_nsobject<NSImage> ns_image(
[[NSImage alloc] initWithSize:NSMakeSize(kWidth1x, kHeight1x)]);
[ns_image addRepresentation:ns_image_rep1];
[ns_image addRepresentation:ns_image_rep2];
@@ -131,7 +131,7 @@ TEST_F(ImageMacTest, UnalignedMultiResolutionNSImageToImageSkia) {
NSBitmapImageRep* ns_image_rep4;
BitmapImageRep(kWidth4x, kHeight4x, &ns_image_rep4);
- scoped_nsobject<NSImage> ns_image(
+ base::scoped_nsobject<NSImage> ns_image(
[[NSImage alloc] initWithSize:NSMakeSize(kWidth1x, kHeight1x)]);
[ns_image addRepresentation:ns_image_rep4];
« ui/base/cocoa/menu_controller.mm ('K') | « ui/gfx/image/image_mac.mm ('k') | ui/gfx/image/image_skia_util_mac.mm » ('j') | ui/message_center/cocoa/popup_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698