mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor_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 "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock-matchers.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"
 #include "third_party/ocmock/gtest_support.h"
-#import "third_party/ocmock/OCMock/OCMock.h"
 #import "third_party/ocmock/ocmock_extensions.h"
 #import "ui/base/test/cocoa_test_event_utils.h"
 
 using ::testing::Return;
 using ::testing::ReturnArg;
 using ::testing::StrictMock;
 using ::testing::A;
 
 namespace {
 
 // TODO(shess): Very similar to AutocompleteTextFieldTest.  Maybe
 // those can be shared.
 
 class AutocompleteTextFieldEditorTest : public CocoaTest {
  public:
   virtual void SetUp() {
     CocoaTest::SetUp();
     NSRect frame = NSMakeRect(0, 0, 50, 30);
-    scoped_nsobject<AutocompleteTextField> field(
+    base::scoped_nsobject<AutocompleteTextField> field(
         [[AutocompleteTextField alloc] initWithFrame:frame]);
     field_ = field.get();
     [field_ setStringValue:@"Testing"];
     [[test_window() contentView] addSubview:field_];
 
     // Arrange for |field_| to get the right field editor.
     window_delegate_.reset(
         [[AutocompleteTextFieldWindowTestDelegate alloc] init]);
     [test_window() setDelegate:window_delegate_.get()];
 
     // Get the field editor setup.
     [test_window() makePretendKeyWindowAndSetFirstResponder:field_];
     editor_ = static_cast<AutocompleteTextFieldEditor*>([field_ currentEditor]);
 
     EXPECT_TRUE(editor_);
     EXPECT_TRUE([editor_ isKindOfClass:[AutocompleteTextFieldEditor class]]);
   }
 
   AutocompleteTextFieldEditor* editor_;
   AutocompleteTextField* field_;
-  scoped_nsobject<AutocompleteTextFieldWindowTestDelegate> window_delegate_;
+  base::scoped_nsobject<AutocompleteTextFieldWindowTestDelegate>
+      window_delegate_;
 };
 
 // Disabled because it crashes sometimes. http://crbug.com/49522
 // Can't rename DISABLED_ because the TEST_VIEW macro prepends.
 //     http://crbug.com/53621
 #if 0
 TEST_VIEW(AutocompleteTextFieldEditorTest, field_);
 #endif
 
 // Test that control characters are stripped from insertions.
@@ skipping 30 matching lines @@
 
 // Test that |delegate| can provide page action menus.
 TEST_F(AutocompleteTextFieldEditorTest, PageActionMenus) {
   // The event just needs to be something the mock can recognize.
   NSEvent* event = cocoa_test_event_utils::MouseEventAtPoint(NSZeroPoint,
                                                              NSRightMouseDown,
                                                              0);
 
   // Trivial menu which we can recognize and which doesn't look like
   // the default editor context menu.
-  scoped_nsobject<id> menu([[NSMenu alloc] initWithTitle:@"Menu"]);
+  base::scoped_nsobject<id> menu([[NSMenu alloc] initWithTitle:@"Menu"]);
   [menu addItemWithTitle:@"Go Fish"
                   action:@selector(goFish:)
            keyEquivalent:@""];
 
   // So that we don't have to mock the observer.
   [editor_ setEditable:NO];
 
   // The delegate's intercept point gets called, and results are
   // propagated back.
   {
@@ skipping 280 matching lines @@
   for (NSUInteger i = 0; i < [items count]; ++i) {
     NSMenuItem* item = [items objectAtIndex:i];
     if ([item action] == @selector(copyURL:)) {
       EXPECT_FALSE([editor_ validateMenuItem:item]);
       break;
     }
   }
 }
 
 }  // namespace