| Index: content/browser/web_contents/web_drag_source_mac_unittest.mm
|
| diff --git a/content/browser/web_contents/web_drag_source_mac_unittest.mm b/content/browser/web_contents/web_drag_source_mac_unittest.mm
|
| index 0ffeeb6c6720e03b37c4ed2b696d18113d619b64..96a401c980bd0fd8f8dc61a69207fb00614da77e 100644
|
| --- a/content/browser/web_contents/web_drag_source_mac_unittest.mm
|
| +++ b/content/browser/web_contents/web_drag_source_mac_unittest.mm
|
| @@ -16,25 +16,24 @@ typedef RenderViewHostTestHarness WebDragSourceMacTest;
|
|
|
| TEST_F(WebDragSourceMacTest, DragInvalidlyEscapedBookmarklet) {
|
| scoped_ptr<WebContents> contents(CreateTestWebContents());
|
| - scoped_nsobject<NSView> view(
|
| + base::scoped_nsobject<NSView> view(
|
| [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 10, 10)]);
|
|
|
| scoped_ptr<WebDropData> dropData(new WebDropData);
|
| dropData->url = GURL("javascript:%");
|
|
|
| WebContentsImpl* contentsImpl = static_cast<WebContentsImpl*>(contents.get());
|
| - scoped_nsobject<WebDragSource> source(
|
| - [[WebDragSource alloc]
|
| - initWithContents:contentsImpl
|
| - view:view
|
| - dropData:dropData.get()
|
| - image:nil
|
| - offset:NSMakePoint(0, 0)
|
| - pasteboard:[NSPasteboard pasteboardWithUniqueName]
|
| - dragOperationMask:NSDragOperationCopy]);
|
| + base::scoped_nsobject<WebDragSource> source([[WebDragSource alloc]
|
| + initWithContents:contentsImpl
|
| + view:view
|
| + dropData:dropData.get()
|
| + image:nil
|
| + offset:NSMakePoint(0, 0)
|
| + pasteboard:[NSPasteboard pasteboardWithUniqueName]
|
| + dragOperationMask:NSDragOperationCopy]);
|
|
|
| // Test that this call doesn't throw any exceptions: http://crbug.com/128371
|
| - scoped_nsobject<NSPasteboard> pasteboard(
|
| + base::scoped_nsobject<NSPasteboard> pasteboard(
|
| [NSPasteboard pasteboardWithUniqueName]);
|
| [source lazyWriteToPasteboard:pasteboard forType:NSURLPboardType];
|
| }
|
|
|