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

Unified Diff: chrome/browser/ui/cocoa/profile_menu_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
Index: chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm
index 06f22b395eb295a87f8b823639c6621f4574815b..60c297cb3c5e8373bf77716ea5fff8270ee95957 100644
--- a/chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm
@@ -4,7 +4,7 @@
#import "chrome/browser/ui/cocoa/profile_menu_controller.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/threading/thread_restrictions.h"
#include "chrome/browser/profiles/avatar_menu_model.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -71,8 +71,8 @@ class ProfileMenuControllerTest : public CocoaProfileTest {
NSMenuItem* menu_item() { return item_.get(); }
private:
- scoped_nsobject<NSMenuItem> item_;
- scoped_nsobject<ProfileMenuController> controller_;
+ base::scoped_nsobject<NSMenuItem> item_;
+ base::scoped_nsobject<ProfileMenuController> controller_;
};
TEST_F(ProfileMenuControllerTest, InitializeMenu) {
@@ -124,7 +124,7 @@ TEST_F(ProfileMenuControllerTest, RebuildMenu) {
}
TEST_F(ProfileMenuControllerTest, InsertItems) {
- scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle: @""]);
+ base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
ASSERT_EQ(0, [menu numberOfItems]);
// With only one profile, insertItems should be a no-op.

Powered by Google App Engine
This is Rietveld 408576698