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

Unified Diff: chrome/browser/ui/cocoa/find_bar/find_bar_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/find_bar/find_bar_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm
index 3714aa546ea3e1a33559fc6580100c2e03ce8f65..6f6ea80cef2ded458aa7dcf17bfa94190db15eff 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_view_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/cocoa_test_helper.h"
#import "chrome/browser/ui/cocoa/find_bar/find_bar_view.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -31,7 +31,7 @@ class FindBarViewTest : public CocoaTest {
public:
FindBarViewTest() {
NSRect frame = NSMakeRect(0, 0, 100, 30);
- scoped_nsobject<FindBarView> view(
+ base::scoped_nsobject<FindBarView> view(
[[FindBarView alloc] initWithFrame:frame]);
view_ = view.get();
[[test_window() contentView] addSubview:view_];
@@ -43,7 +43,7 @@ class FindBarViewTest : public CocoaTest {
TEST_VIEW(FindBarViewTest, view_)
TEST_F(FindBarViewTest, FindBarEatsMouseClicksInBackgroundArea) {
- scoped_nsobject<MouseDownViewPong> pongView(
+ base::scoped_nsobject<MouseDownViewPong> pongView(
[[MouseDownViewPong alloc] initWithFrame:NSMakeRect(0, 0, 200, 200)]);
// Remove all of the subviews of the findbar, to make sure we don't
@@ -68,7 +68,7 @@ TEST_F(FindBarViewTest, FindBarEatsMouseClicksInBackgroundArea) {
}
TEST_F(FindBarViewTest, FindBarPassesThroughClicksInTransparentArea) {
- scoped_nsobject<MouseDownViewPong> pongView(
+ base::scoped_nsobject<MouseDownViewPong> pongView(
[[MouseDownViewPong alloc] initWithFrame:NSMakeRect(0, 0, 200, 200)]);
[view_ setFrame:NSMakeRect(0, 0, 200, 200)];

Powered by Google App Engine
This is Rietveld 408576698