mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/location_bar/autocomplete_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/mac/foundation_util.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/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "grit/theme_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using ::testing::A;
 using ::testing::InSequence;
 using ::testing::Return;
@@ skipping 43 matching lines @@
 // 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 AutocompleteTextFieldTest : public CocoaTest {
  public:
   AutocompleteTextFieldTest() {
     // Make sure this is wide enough to play games with the cell
     // decorations.
     NSRect frame = NSMakeRect(0, 0, kWidth, 30);
-    scoped_nsobject<AutocompleteTextField> field(
+    base::scoped_nsobject<AutocompleteTextField> field(
         [[AutocompleteTextField alloc] initWithFrame:frame]);
     field_ = field.get();
     [field_ setStringValue:@"Test test"];
     [[test_window() contentView] addSubview:field_];
 
     AutocompleteTextFieldCell* cell = [field_ cell];
     [cell clearDecorations];
 
     mock_left_decoration_.SetVisible(false);
     [cell addLeftDecoration:&mock_left_decoration_];
@@ skipping 33 matching lines @@
   }
 
   AutocompleteTextFieldEditor* FieldEditor() {
     return base::mac::ObjCCastStrict<AutocompleteTextFieldEditor>(
         [field_ currentEditor]);
   }
 
   AutocompleteTextField* field_;
   MockDecoration mock_left_decoration_;
   MockDecoration mock_right_decoration_;
-  scoped_nsobject<AutocompleteTextFieldWindowTestDelegate> window_delegate_;
+  base::scoped_nsobject<AutocompleteTextFieldWindowTestDelegate>
+      window_delegate_;
 };
 
 TEST_VIEW(AutocompleteTextFieldTest, field_);
 
 // Base class for testing AutocompleteTextFieldObserver messages.
 class AutocompleteTextFieldObserverTest : public AutocompleteTextFieldTest {
  public:
   virtual void SetUp() {
     AutocompleteTextFieldTest::SetUp();
     [field_ setObserver:&field_observer_];
@@ skipping 472 matching lines @@
 // the cell, and the cell tests should test that the right things are
 // selected.  It's easier to mock the event here, though.  This code's
 // event-mockers might be worth promoting to |cocoa_test_event_utils.h| or
 // |cocoa_test_helper.h|.
 TEST_F(AutocompleteTextFieldTest, DecorationMenu) {
   AutocompleteTextFieldCell* cell = [field_ cell];
   const NSRect bounds([field_ bounds]);
 
   const CGFloat edge = NSHeight(bounds) - 4.0;
   const NSSize size = NSMakeSize(edge, edge);
-  scoped_nsobject<NSImage> image([[NSImage alloc] initWithSize:size]);
+  base::scoped_nsobject<NSImage> image([[NSImage alloc] initWithSize:size]);
 
-  scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"Menu"]);
+  base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@"Menu"]);
 
   mock_left_decoration_.SetVisible(true);
   mock_right_decoration_.SetVisible(true);
 
   // The item with a menu returns it.
   NSRect actionFrame = [cell frameForDecoration:&mock_right_decoration_
                                         inFrame:bounds];
   NSPoint location = NSMakePoint(NSMidX(actionFrame), NSMidY(actionFrame));
   NSEvent* event = Event(field_, location, NSRightMouseDown, 1);
 
@@ skipping 29 matching lines @@
   [field_ setAllowsEditingTextAttributes:YES];
 
   // Set an attribute different from the field's default so we can
   // tell we got the same string out as we put in.
   NSFont* font = [NSFont fontWithDescriptor:[[field_ font] fontDescriptor]
                                        size:[[field_ font] pointSize] + 2];
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:font
                                   forKey:NSFontAttributeName];
   NSString* const kString = @"This is a test";
-  scoped_nsobject<NSAttributedString> attributedString(
+  base::scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:kString
                                       attributes:attributes]);
 
   // Check that what we get back looks like what we put in.
   EXPECT_NSNE(kString, [field_ stringValue]);
   [field_ setAttributedStringValue:attributedString];
   EXPECT_TRUE([[field_ attributedStringValue]
                 isEqualToAttributedString:attributedString]);
   EXPECT_NSEQ(kString, [field_ stringValue]);
 
@@ skipping 12 matching lines @@
 }
 
 // -setAttributedStringValue: shouldn't reset the undo state if things
 // are being editted.
 TEST_F(AutocompleteTextFieldTest, SetAttributedStringUndo) {
   NSColor* redColor = [NSColor redColor];
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:redColor
                                   forKey:NSForegroundColorAttributeName];
   NSString* const kString = @"This is a test";
-  scoped_nsobject<NSAttributedString> attributedString(
+  base::scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc] initWithString:kString
                                       attributes:attributes]);
   [test_window() makePretendKeyWindowAndSetFirstResponder:field_];
   EXPECT_TRUE([field_ currentEditor]);
   NSTextView* editor = static_cast<NSTextView*>([field_ currentEditor]);
   NSUndoManager* undoManager = [editor undoManager];
   EXPECT_TRUE(undoManager);
 
   // Nothing to undo, yet.
   EXPECT_FALSE([undoManager canUndo]);
@@ skipping 88 matching lines @@
 
 // Test that the resign-key notification is forwarded right, and that
 // the notification is registered and unregistered when the view moves
 // in and out of the window.
 // TODO(shess): Should this test the key window for realz?  That would
 // be really annoying to whoever is running the tests.
 TEST_F(AutocompleteTextFieldObserverTest, ClosePopupOnResignKey) {
   EXPECT_CALL(field_observer_, ClosePopup());
   [test_window() resignKeyWindow];
 
-  scoped_nsobject<AutocompleteTextField> pin([field_ retain]);
+  base::scoped_nsobject<AutocompleteTextField> pin([field_ retain]);
   [field_ removeFromSuperview];
   [test_window() resignKeyWindow];
 
   [[test_window() contentView] addSubview:field_];
   EXPECT_CALL(field_observer_, ClosePopup());
   [test_window() resignKeyWindow];
 }
 
 }  // namespace