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

Unified Diff: chrome/browser/ui/cocoa/bubble_view_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/bubble_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bubble_view_unittest.mm b/chrome/browser/ui/cocoa/bubble_view_unittest.mm
index 4b8850e9ccf5b3f08ecb38a9f623a302eb7e9852..c1b5d9b49c46ab369e76d214acdc41afb130efe9 100644
--- a/chrome/browser/ui/cocoa/bubble_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/bubble_view_unittest.mm
@@ -3,7 +3,7 @@
// found in the LICENSE file.
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/bubble_view.h"
#include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#import "testing/gtest_mac.h"
@@ -12,7 +12,7 @@ class BubbleViewTest : public CocoaTest {
public:
BubbleViewTest() {
NSRect frame = NSMakeRect(0, 0, 50, 50);
- scoped_nsobject<BubbleView> view(
+ base::scoped_nsobject<BubbleView> view(
[[BubbleView alloc] initWithFrame:frame themeProvider:test_window()]);
view_ = view.get();
[[test_window() contentView] addSubview:view_];
@@ -27,7 +27,7 @@ TEST_VIEW(BubbleViewTest, view_);
// Test a nil themeProvider in init.
TEST_F(BubbleViewTest, NilThemeProvider) {
NSRect frame = NSMakeRect(0, 0, 50, 50);
- scoped_nsobject<BubbleView> view(
+ base::scoped_nsobject<BubbleView> view(
[[BubbleView alloc] initWithFrame:frame themeProvider:nil]);
[[test_window() contentView] addSubview:view.get()];
[view display];

Powered by Google App Engine
This is Rietveld 408576698