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

Unified Diff: chrome/browser/ui/cocoa/clickhold_button_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/clickhold_button_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
index f76f80530fcc9f36c47d36f0cc300cb9907fcab4..07862719ef71e6a3917bb69f17b50a0f5937ba9f 100644
--- a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
@@ -4,7 +4,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/clickhold_button_cell.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -16,9 +16,10 @@ class ClickHoldButtonCellTest : public CocoaTest {
public:
ClickHoldButtonCellTest() {
NSRect frame = NSMakeRect(0, 0, 50, 30);
- scoped_nsobject<NSButton> view([[NSButton alloc] initWithFrame:frame]);
+ base::scoped_nsobject<NSButton> view(
+ [[NSButton alloc] initWithFrame:frame]);
view_ = view.get();
- scoped_nsobject<ClickHoldButtonCell> cell(
+ base::scoped_nsobject<ClickHoldButtonCell> cell(
[[ClickHoldButtonCell alloc] initTextCell:@"Testing"]);
[view_ setCell:cell.get()];
[[test_window() contentView] addSubview:view_];

Powered by Google App Engine
This is Rietveld 408576698