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

Unified Diff: chrome/browser/ui/tests/ui_gfx_image_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
Index: chrome/browser/ui/tests/ui_gfx_image_unittest.mm
diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm
index e025ccca8598c1873994c391d2797a61c10e2609..4e45cf20aa886ae12fae13821110e4f72bb59b38 100644
--- a/chrome/browser/ui/tests/ui_gfx_image_unittest.mm
+++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.mm
@@ -5,7 +5,7 @@
#import <AppKit/AppKit.h>
#import "base/mac/mac_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -45,7 +45,7 @@ TEST_F(UiGfxImageTest, DISABLED_CheckColor) {
}
TEST_F(UiGfxImageTest, ImageView) {
- scoped_nsobject<NSImageView> image_view(
+ base::scoped_nsobject<NSImageView> image_view(
[[NSImageView alloc] initWithFrame:NSMakeRect(10, 10, 25, 25)]);
[[test_window() contentView] addSubview:image_view];
[test_window() orderFront:nil];

Powered by Google App Engine
This is Rietveld 408576698