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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/message_center/cocoa/popup_collection_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/base/cocoa/menu_controller.mm ('K') | « ui/message_center/cocoa/popup_collection.h ('k') | ui/message_center/cocoa/popup_controller.h » ('j') | ui/message_center/cocoa/popup_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/cocoa/popup_collection_unittest.mm
diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm
index 2375d03365e7ad2742875097449007668d51c933..36876acac04ff487efa27469d492399dbb7275d1 100644
--- a/ui/message_center/cocoa/popup_collection_unittest.mm
+++ b/ui/message_center/cocoa/popup_collection_unittest.mm
@@ -4,7 +4,7 @@
#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"
@@ -111,7 +111,7 @@ class PopupCollectionTest : public ui::CocoaTest {
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) {
« ui/base/cocoa/menu_controller.mm ('K') | « ui/message_center/cocoa/popup_collection.h ('k') | ui/message_center/cocoa/popup_controller.h » ('j') | ui/message_center/cocoa/popup_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698