mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 
 #include <cmath>
 
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 299 matching lines @@
                                         defer:YES]);
     [popup_ setMovableByWindowBackground:NO];
     // The window shape is determined by the content view.
     [popup_ setAlphaValue:1.0];
     [popup_ setOpaque:YES];
     [popup_ setBackgroundColor:BackgroundColor()];
     [popup_ setHasShadow:YES];
     [popup_ setLevel:NSNormalWindowLevel];
     // Use a flipped view to pin the matrix top the top left. This is needed
     // for animated resize.
-    scoped_nsobject<FlippedView> contentView(
+    base::scoped_nsobject<FlippedView> contentView(
         [[FlippedView alloc] initWithFrame:NSZeroRect]);
     [popup_ setContentView:contentView];
 
     autocomplete_matrix_.reset(
         [[AutocompleteMatrix alloc] initWithPopupView:this]);
     [contentView addSubview:autocomplete_matrix_];
 
     // TODO(dtseng): Ignore until we provide NSAccessibility support.
     [popup_ accessibilitySetOverrideValue:NSAccessibilityUnknownRole
         forAttribute:NSAccessibilityRoleAttribute];
@@ skipping 28 matching lines @@
   [autocomplete_matrix_ setFrame:matrixFrame];
 
   NSRect currentPopupFrame = [popup_ frame];
   targetPopupFrame_ = popupFrame;
 
   // Animate the frame change if the only change is that the height got smaller.
   // Otherwise, resize immediately.
   bool animate = (NSHeight(popupFrame) < NSHeight(currentPopupFrame) &&
                   NSWidth(popupFrame) == NSWidth(currentPopupFrame));
 
-  scoped_nsobject<NSDictionary> savedAnimations;
+  base::scoped_nsobject<NSDictionary> savedAnimations;
   if (!animate) {
     // In an ideal world, running a zero-length animation would cancel any
     // running animations and set the new frame value immediately.  In practice,
     // zero-length animations are ignored entirely.  Work around this AppKit bug
     // by explicitly setting an NSNull animation for the "frame" key and then
     // running the animation with a non-zero(!!) duration.  This somehow
     // convinces AppKit to do the right thing.  Save off the current animations
     // dictionary so it can be restored later.
     savedAnimations.reset([[popup_ animations] copy]);
     [popup_ setAnimations:
@@ skipping 196 matching lines @@
     [self removeTrackingArea:trackingArea];
   }
 
   // TODO(shess): Consider overriding -acceptsFirstMouse: and changing
   // NSTrackingActiveInActiveApp to NSTrackingActiveAlways.
   NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited;
   options |= NSTrackingMouseMoved;
   options |= NSTrackingActiveInActiveApp;
   options |= NSTrackingInVisibleRect;
 
-  scoped_nsobject<NSTrackingArea> trackingArea(
+  base::scoped_nsobject<NSTrackingArea> trackingArea(
       [[NSTrackingArea alloc] initWithRect:[self frame]
                                    options:options
                                      owner:self
                                   userInfo:nil]);
   [self addTrackingArea:trackingArea];
 }
 
 - (void)updateTrackingAreas {
   [self resetTrackingArea];
   [super updateTrackingAreas];
@@ skipping 139 matching lines @@
   const NSUInteger count = [cells count];
   for(NSUInteger i = 0; i < count; ++i) {
     if ([[cells objectAtIndex:i] isHighlighted]) {
       return i;
     }
   }
   return -1;
 }
 
 @end