Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/message_center/cocoa/tray_view_controller_unittest.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« skia/ext/skia_utils_mac_unittest.mm ('K') | « ui/message_center/cocoa/tray_view_controller.mm ('k') | ui/shell_dialogs/select_file_dialog_mac.mm » ('j') | webkit/common/cursors/webcursor_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/tray_view_controller_unittest.mm
diff --git a/ui/message_center/cocoa/tray_view_controller_unittest.mm b/ui/message_center/cocoa/tray_view_controller_unittest.mm
index 0296a7a42ce090f039d57435f53288fde1ab4500..55a48d76c585253cd3b6e829d52935a2592e4bba 100644
--- a/ui/message_center/cocoa/tray_view_controller_unittest.mm
+++ b/ui/message_center/cocoa/tray_view_controller_unittest.mm
@@ -4,7 +4,7 @@
#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"
@@ -57,7 +57,7 @@ class TrayViewControllerTest : public ui::CocoaTest {
base::MessageLoop message_loop_;
scoped_ptr<base::RunLoop> nested_run_loop_;
- scoped_nsobject<MCTrayViewController> tray_;
+ base::scoped_nsobject<MCTrayViewController> tray_;
};
TEST_F(TrayViewControllerTest, AddRemoveOne) {
« skia/ext/skia_utils_mac_unittest.mm ('K') | « ui/message_center/cocoa/tray_view_controller.mm ('k') | ui/shell_dialogs/select_file_dialog_mac.mm » ('j') | webkit/common/cursors/webcursor_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698