| Index: ui/snapshot/snapshot_mac_unittest.mm
|
| diff --git a/ui/snapshot/snapshot_mac_unittest.mm b/ui/snapshot/snapshot_mac_unittest.mm
|
| index 362902e3ce7ab9da2280cefc1cb2bdc11bbb2592..2765792d655a59a2144dd0fd6dd0e9fced44aa04 100644
|
| --- a/ui/snapshot/snapshot_mac_unittest.mm
|
| +++ b/ui/snapshot/snapshot_mac_unittest.mm
|
| @@ -6,8 +6,8 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/mac/sdk_forward_declarations.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "testing/platform_test.h"
|
| #include "ui/gfx/rect.h"
|
| @@ -20,7 +20,7 @@ typedef PlatformTest GrabWindowSnapshotTest;
|
| TEST_F(GrabWindowSnapshotTest, TestGrabWindowSnapshot) {
|
| // Launch a test window so we can take a snapshot.
|
| NSRect frame = NSMakeRect(0, 0, 400, 400);
|
| - scoped_nsobject<NSWindow> window(
|
| + base::scoped_nsobject<NSWindow> window(
|
| [[NSWindow alloc] initWithContentRect:frame
|
| styleMask:NSBorderlessWindowMask
|
| backing:NSBackingStoreBuffered
|
| @@ -35,7 +35,7 @@ TEST_F(GrabWindowSnapshotTest, TestGrabWindowSnapshot) {
|
| bounds));
|
|
|
| // Copy png back into NSData object so we can make sure we grabbed a png.
|
| - scoped_nsobject<NSData> image_data(
|
| + base::scoped_nsobject<NSData> image_data(
|
| [[NSData alloc] initWithBytes:&(*png_representation)[0]
|
| length:png_representation->size()]);
|
| NSBitmapImageRep* rep = [NSBitmapImageRep imageRepWithData:image_data.get()];
|
|
|