mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm

 // Copyright (c) 2011 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/find_bar/find_bar_text_field_cell.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 @interface FindBarTextFieldCell (ExposedForTesting)
 - (NSAttributedString*)resultsAttributedString;
 @end
 
 @implementation FindBarTextFieldCell (ExposedForTesting)
 - (NSAttributedString*)resultsAttributedString {
   return resultsString_.get();
 }
 @end
 
 namespace {
 
 // Width of the field so that we don't have to ask |field_| for it all
 // the time.
 const CGFloat kWidth(300.0);
 
 // A narrow width for tests which test things that don't fit.
 const CGFloat kNarrowWidth(5.0);
 
 class FindBarTextFieldCellTest : public CocoaTest {
  public:
   FindBarTextFieldCellTest() {
     // Make sure this is wide enough to play games with the cell
     // decorations.
     const NSRect frame = NSMakeRect(0, 0, kWidth, 30);
 
-    scoped_nsobject<FindBarTextFieldCell> cell(
+    base::scoped_nsobject<FindBarTextFieldCell> cell(
         [[FindBarTextFieldCell alloc] initTextCell:@"Testing"]);
     cell_ = cell;
     [cell_ setEditable:YES];
     [cell_ setBordered:YES];
 
-    scoped_nsobject<NSTextField> view(
+    base::scoped_nsobject<NSTextField> view(
         [[NSTextField alloc] initWithFrame:frame]);
     view_ = view;
     [view_ setCell:cell_];
 
     [[test_window() contentView] addSubview:view_];
   }
 
   NSTextField* view_;
   FindBarTextFieldCell* cell_;
 };
@@ skipping 18 matching lines @@
   [view_ display];
 
   [cell_ clearResults];
   [view_ display];
 }
 
 // Verify that setting and clearing the find results changes the results string
 // appropriately.
 TEST_F(FindBarTextFieldCellTest, SetAndClearFindResults) {
   [cell_ setActiveMatch:10 of:30];
-  scoped_nsobject<NSAttributedString> tenString(
+  base::scoped_nsobject<NSAttributedString> tenString(
       [[cell_ resultsAttributedString] copy]);
   EXPECT_GT([tenString length], 0U);
 
   [cell_ setActiveMatch:0 of:0];
-  scoped_nsobject<NSAttributedString> zeroString(
+  base::scoped_nsobject<NSAttributedString> zeroString(
       [[cell_ resultsAttributedString] copy]);
   EXPECT_GT([zeroString length], 0U);
   EXPECT_FALSE([tenString isEqualToAttributedString:zeroString]);
 
   [cell_ clearResults];
   EXPECT_EQ(0U, [[cell_ resultsAttributedString] length]);
 }
 
 TEST_F(FindBarTextFieldCellTest, TextFrame) {
   const NSRect bounds = [view_ bounds];
@@ skipping 28 matching lines @@
   EXPECT_TRUE(NSContainsRect(textFrame, NSInsetRect(drawingRect, 1, 1)));
 
   [cell_ setActiveMatch:4 of:5];
   textFrame = [cell_ textFrameForFrame:bounds];
   drawingRect = [cell_ drawingRectForBounds:bounds];
   EXPECT_FALSE(NSIsEmptyRect(drawingRect));
   EXPECT_TRUE(NSContainsRect(textFrame, NSInsetRect(drawingRect, 1, 1)));
 }
 
 }  // namespace