mac: Update clients of scoped_nsobject.h.

content/browser/web_contents/web_drag_dest_mac_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/mac/scoped_nsautorelease_pool.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #import "content/browser/web_contents/web_drag_dest_mac.h"
 #include "content/test/test_web_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "webkit/common/webdropdata.h"
@@ skipping 29 matching lines @@
                                                kCrCorePasteboardFlavorType_urln,
                                                nil]
                owner:nil];
     [pboard setString:urlString
               forType:kCrCorePasteboardFlavorType_url];
     [pboard setString:title
               forType:kCrCorePasteboardFlavorType_urln];
   }
 
   base::mac::ScopedNSAutoreleasePool pool_;
-  scoped_nsobject<WebDragDest> drag_dest_;
+  base::scoped_nsobject<WebDragDest> drag_dest_;
 };
 
 // Make sure nothing leaks.
 TEST_F(WebDragDestTest, Init) {
   EXPECT_TRUE(drag_dest_);
 }
 
 // Test flipping of coordinates given a point in window coordinates.
 TEST_F(WebDragDestTest, Flip) {
   NSPoint windowPoint = NSZeroPoint;
-  scoped_nsobject<NSWindow> window([[CocoaTestHelperWindow alloc] init]);
+  base::scoped_nsobject<NSWindow> window([[CocoaTestHelperWindow alloc] init]);
   NSPoint viewPoint =
       [drag_dest_ flipWindowPointToView:windowPoint
                                    view:[window contentView]];
   NSPoint screenPoint =
       [drag_dest_ flipWindowPointToScreen:windowPoint
                                      view:[window contentView]];
   EXPECT_EQ(0, viewPoint.x);
   EXPECT_EQ(600, viewPoint.y);
   EXPECT_EQ(0, screenPoint.x);
   // We can't put a value on the screen size since everyone will have a
@@ skipping 77 matching lines @@
   NSString* textString = @"hi there";
   [pboard setString:htmlString forType:NSHTMLPboardType];
   [pboard setString:textString forType:NSStringPboardType];
   [drag_dest_ populateWebDropData:&data fromPasteboard:pboard];
   EXPECT_EQ(data.url.spec(), "http://www.google.com/");
   EXPECT_EQ(base::SysNSStringToUTF16(textString), data.text.string());
   EXPECT_EQ(base::SysNSStringToUTF16(htmlString), data.html.string());
 
   [pboard releaseGlobally];
 }