mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/styled_text_field_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/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
+#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/styled_text_field.h"
 #import "chrome/browser/ui/cocoa/styled_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/styled_text_field_test_helper.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Width of the field so that we don't have to ask |field_| for it all
 // the time.
 static const CGFloat kWidth(300.0);
 
 class StyledTextFieldTest : public CocoaTest {
  public:
   StyledTextFieldTest() {
     // Make sure this is wide enough to play games with the cell
     // decorations.
     NSRect frame = NSMakeRect(0, 0, kWidth, 30);
 
-    scoped_nsobject<StyledTextFieldTestCell> cell(
+    base::scoped_nsobject<StyledTextFieldTestCell> cell(
         [[StyledTextFieldTestCell alloc] initTextCell:@"Testing"]);
     cell_ = cell.get();
     [cell_ setEditable:YES];
     [cell_ setBordered:YES];
 
-    scoped_nsobject<StyledTextField> field(
+    base::scoped_nsobject<StyledTextField> field(
         [[StyledTextField alloc] initWithFrame:frame]);
     field_ = field.get();
     [field_ setCell:cell_];
 
     [[test_window() contentView] addSubview:field_];
   }
 
   // Helper to return the field-editor frame being used w/in |field_|.
   NSRect EditorFrame() {
     EXPECT_TRUE([field_ currentEditor]);
@@ skipping 143 matching lines @@
   EXPECT_TRUE(NSContainsRect(EditorFrame(), baseEditorFrame));
 
   // Setting the same margin and using -resetFieldEditorFrameIfNeeded should
   // result in the same frame as the standard focus machinery.
   [cell_ setRightMargin:kRightMargin];
   [field_ resetFieldEditorFrameIfNeeded];
   EXPECT_TRUE(NSEqualRects(baseEditorFrame, EditorFrame()));
 }
 
 }  // namespace