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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol 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
« ui/message_center/cocoa/tray_controller.mm ('K') | « ui/message_center/cocoa/tray_controller.mm ('k') | ui/message_center/cocoa/tray_view_controller.h » ('j') | webkit/common/user_agent/user_agent_util_ios.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/tray_controller_unittest.mm
diff --git a/ui/message_center/cocoa/tray_controller_unittest.mm b/ui/message_center/cocoa/tray_controller_unittest.mm
index a857bf4eb60d985c85ef860de26bc44cd0d42d0f..379c3dea4ffb34c8b0aae6ee01992093a3801dac 100644
--- a/ui/message_center/cocoa/tray_controller_unittest.mm
+++ b/ui/message_center/cocoa/tray_controller_unittest.mm
@@ -4,7 +4,7 @@
#import "ui/message_center/cocoa/tray_controller.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#import "ui/base/test/ui_cocoa_test_helper.h"
#include "ui/message_center/message_center.h"
@@ -32,7 +32,7 @@ class TrayControllerTest : public ui::CocoaTest {
protected:
scoped_ptr<message_center::MessageCenterTray> tray_;
- scoped_nsobject<MCTrayController> controller_;
+ base::scoped_nsobject<MCTrayController> controller_;
};
TEST_F(TrayControllerTest, OpenLeftRight) {
« ui/message_center/cocoa/tray_controller.mm ('K') | « ui/message_center/cocoa/tray_controller.mm ('k') | ui/message_center/cocoa/tray_view_controller.h » ('j') | webkit/common/user_agent/user_agent_util_ios.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698