mac: Update clients of scoped_nsobject.h.

chrome/browser/app_controller_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_APP_CONTROLLER_MAC_H_
 #define CHROME_BROWSER_APP_CONTROLLER_MAC_H_
 
 #if defined(__OBJC__)
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "ui/base/work_area_watcher_observer.h"
 
 class BookmarkMenuBridge;
 class CommandUpdater;
 class GURL;
 class HistoryMenuBridge;
 class Profile;
@@ skipping 15 matching lines @@
   // build the user-data specific main menu items.
   Profile* lastProfile_;
 
   // Management of the bookmark menu which spans across all windows
   // (and Browser*s).
   scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_;
   scoped_ptr<HistoryMenuBridge> historyMenuBridge_;
 
   // The profile menu, which appears right before the Help menu. It is only
   // available when multiple profiles is enabled.
-  scoped_nsobject<ProfileMenuController> profileMenuController_;
+  base::scoped_nsobject<ProfileMenuController> profileMenuController_;
 
   // If we're told to open URLs (in particular, via |-application:openFiles:| by
   // Launch Services) before we've launched the browser, we queue them up in
   // |startupUrls_| so that they can go in the first browser window/tab.
   std::vector<GURL> startupUrls_;
   BOOL startupComplete_;
 
   // Outlets for the close tab/window menu items so that we can adjust the
   // commmand-key equivalent depending on the kind of window and how many
   // tabs it has.
@@ skipping 71 matching lines @@
 namespace app_controller_mac {
 
 // True if we are currently handling an IDC_NEW_{TAB,WINDOW} command. Used in
 // SessionService::Observe() to get around windows/linux and mac having
 // different models of application lifetime.
 bool IsOpeningNewWindow();
 
 }  // namespace app_controller_mac
 
 #endif