Index: ui/compositor/test/test_compositor_host_mac.mm |
diff --git a/ui/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm |
index 02c3ed63564123deb58df13f8dee1172280b014f..3debc020fd08b73b609f1d74621b52a44bb7ce81 100644 |
--- a/ui/compositor/test/test_compositor_host_mac.mm |
+++ b/ui/compositor/test/test_compositor_host_mac.mm |
@@ -11,7 +11,7 @@ |
#import <Foundation/NSAutoreleasePool.h> |
#include "base/compiler_specific.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/memory/scoped_ptr.h" |
#include "ui/compositor/compositor.h" |
#include "ui/gfx/rect.h" |
@@ -126,7 +126,8 @@ void TestCompositorHostMac::Show() { |
styleMask:NSBorderlessWindowMask |
backing:NSBackingStoreBuffered |
defer:NO]; |
- scoped_nsobject<AcceleratedTestView> view([[AcceleratedTestView alloc] init]); |
+ base::scoped_nsobject<AcceleratedTestView> view( |
+ [[AcceleratedTestView alloc] init]); |
compositor_.reset(new ui::Compositor(this, view, bounds_.size())); |
[view setCompositor:compositor_.get()]; |
[window_ setContentView:view]; |