mac: Update clients of scoped_nsobject.h.

ui/message_center/cocoa/popup_collection_unittest.mm

 // Copyright (c) 2013 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 "ui/message_center/cocoa/popup_collection.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #import "ui/message_center/cocoa/notification_controller.h"
 #import "ui/message_center/cocoa/popup_controller.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
@@ skipping 86 matching lines @@
     if (![collection_ isAnimating])
       return;
     nested_run_loop_.reset(new base::RunLoop());
     nested_run_loop_->Run();
     nested_run_loop_.reset();
   }
 
   base::MessageLoop message_loop_;
   scoped_ptr<base::RunLoop> nested_run_loop_;
   message_center::MessageCenter* center_;
-  scoped_nsobject<MCPopupCollection> collection_;
+  base::scoped_nsobject<MCPopupCollection> collection_;
 };
 
 TEST_F(PopupCollectionTest, AddThreeCloseOne) {
   EXPECT_EQ(0u, [[collection_ popups] count]);
   AddThreeNotifications();
   EXPECT_EQ(3u, [[collection_ popups] count]);
 
   center_->RemoveNotification("2", true);
   WaitForAnimationEnded();
   EXPECT_EQ(2u, [[collection_ popups] count]);
@@ skipping 232 matching lines @@
       string16(),
       std::string(),
       message_center::RichNotificationData(),
       NULL));
   center_->UpdateNotification("1", notification.Pass());
 
   // Release the popup collection before the animation ends. No crash should
   // be expected.
   collection_.reset();
 }