mac: Update clients of scoped_nsobject.h.

ui/message_center/cocoa/tray_view_controller_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/tray_view_controller.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "ui/message_center/fake_notifier_settings_provider.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_impl.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notifier_settings.h"
@@ skipping 32 matching lines @@
     nested_run_loop_.reset(new base::RunLoop());
     nested_run_loop_->Run();
     nested_run_loop_.reset();
   }
 
  protected:
   message_center::MessageCenter* center_;  // Weak, global.
 
   base::MessageLoop message_loop_;
   scoped_ptr<base::RunLoop> nested_run_loop_;
-  scoped_nsobject<MCTrayViewController> tray_;
+  base::scoped_nsobject<MCTrayViewController> tray_;
 };
 
 TEST_F(TrayViewControllerTest, AddRemoveOne) {
   NSScrollView* view = [[tray_ scrollView] documentView];
   EXPECT_EQ(0u, [[view subviews] count]);
   scoped_ptr<message_center::Notification> notification_data;
   notification_data.reset(new message_center::Notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       "1",
       ASCIIToUTF16("First notification"),
@@ skipping 159 matching lines @@
   EXPECT_LT(trayHeight, NSHeight([[tray_ view] frame]));
 
   [tray_ hideSettings:nil];
   EXPECT_EQ(1, provider.closed_called_count());
 
   // The tray should be back at its previous height now.
   EXPECT_EQ(trayHeight, NSHeight([[tray_ view] frame]));
 }
 
 }  // namespace message_center