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

Unified Diff: chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_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/autofill/down_arrow_popup_menu_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm b/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm
index d41b49677af4362bbddcb10e1ea740bd7e647829..4d878d692f7ec44a0d2817a2c55a91fbdedb7582 100644
--- a/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell_unittest.mm
@@ -6,7 +6,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -19,13 +19,13 @@ class DownArrowPopupMenuCellTest : public ui::CocoaTest {
DownArrowPopupMenuCellTest() {
NSRect frame = NSMakeRect(0, 0, 50, 30);
view_.reset([[NSButton alloc] initWithFrame:frame]);
- scoped_nsobject<DownArrowPopupMenuCell> cell(
+ base::scoped_nsobject<DownArrowPopupMenuCell> cell(
[[DownArrowPopupMenuCell alloc] initTextCell:@"Testing"]);
[view_ setCell:cell.get()];
[[test_window() contentView] addSubview:view_]; }
protected:
- scoped_nsobject<NSButton> view_;
+ base::scoped_nsobject<NSButton> view_;
private:
DISALLOW_COPY_AND_ASSIGN(DownArrowPopupMenuCellTest);
@@ -50,7 +50,8 @@ TEST_F(DownArrowPopupMenuCellTest, Defaults) {
ASSERT_TRUE([cell isKindOfClass:[DownArrowPopupMenuCell class]]);
NSRect rect = NSMakeRect(0, 0, 11, 17);
- scoped_nsobject<NSImage> image([[NSImage alloc] initWithSize:rect.size]);
+ base::scoped_nsobject<NSImage> image(
+ [[NSImage alloc] initWithSize:rect.size]);
[cell setImage:image forButtonState:image_button_cell::kDefaultState];
[view_ setTitle:@"Testing"];

Powered by Google App Engine
This is Rietveld 408576698