mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/framed_browser_window_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/debug/debugger.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 class FramedBrowserWindowTest : public CocoaTest {
@@ skipping 28 matching lines @@
     // Inset to mask off left and right edges which vary in HighDPI.
     NSRect bounds = NSInsetRect([frameView bounds], 4, 0);
 
     // On 10.6, the grippy changes appearance slightly when painted the second
     // time in a textured window. Since this test cares about the window title,
     // cut off the bottom of the window.
     bounds.size.height -= 40;
     bounds.origin.y += 40;
 
     [frameView lockFocus];
-    scoped_nsobject<NSBitmapImageRep> bitmap(
+    base::scoped_nsobject<NSBitmapImageRep> bitmap(
         [[NSBitmapImageRep alloc] initWithFocusedViewRect:bounds]);
     [frameView unlockFocus];
 
     return [bitmap TIFFRepresentation];
   }
 
   FramedBrowserWindow* window_;
 };
 
 // Baseline test that the window creates, displays, closes, and
@@ skipping 102 matching lines @@
   miniaturizeControl = [window_ standardWindowButton:NSWindowMiniaturizeButton];
   EXPECT_TRUE(miniaturizeControl);
   miniaturizeFrame = [miniaturizeControl frame];
   EXPECT_EQ(NSMaxY(miniaturizeFrame),
             NSMaxY(windowBounds) -
                 kFramedWindowButtonsWithTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(miniaturizeFrame),
             NSMaxX(closeBoxFrame) + [window_ windowButtonsInterButtonSpacing]);
   [window_ setWindowController:nil];
 }