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

Unified Diff: chrome/browser/ui/cocoa/draggable_button_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/draggable_button_unittest.mm
diff --git a/chrome/browser/ui/cocoa/draggable_button_unittest.mm b/chrome/browser/ui/cocoa/draggable_button_unittest.mm
index 6ee44a4d63e23dffe764a10cb0882e8407d910fa..3cada7e655f3e0f5add3569e4e76ad5fd698633d 100644
--- a/chrome/browser/ui/cocoa/draggable_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/draggable_button_unittest.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#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/draggable_button.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -47,8 +47,9 @@ class DraggableButtonTest : public CocoaTest {};
// Make sure the basic case of "click" still works.
TEST_F(DraggableButtonTest, DownUp) {
- scoped_nsobject<TestableDraggableButton> button(
- [[TestableDraggableButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
+ base::scoped_nsobject<TestableDraggableButton> button(
+ [[TestableDraggableButton alloc]
+ initWithFrame:NSMakeRect(0, 0, 500, 500)]);
[[test_window() contentView] addSubview:button.get()];
[button setTarget:button];
[button setAction:@selector(trigger:)];
@@ -67,8 +68,9 @@ TEST_F(DraggableButtonTest, DownUp) {
}
TEST_F(DraggableButtonTest, DraggableHysteresis) {
- scoped_nsobject<TestableDraggableButton> button(
- [[TestableDraggableButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
+ base::scoped_nsobject<TestableDraggableButton> button(
+ [[TestableDraggableButton alloc]
+ initWithFrame:NSMakeRect(0, 0, 500, 500)]);
[[test_window() contentView] addSubview:button.get()];
NSEvent* downEvent =
cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(10,10),
@@ -106,8 +108,9 @@ TEST_F(DraggableButtonTest, DraggableHysteresis) {
}
TEST_F(DraggableButtonTest, ResetState) {
- scoped_nsobject<TestableDraggableButton> button(
- [[TestableDraggableButton alloc] initWithFrame:NSMakeRect(0,0,500,500)]);
+ base::scoped_nsobject<TestableDraggableButton> button(
+ [[TestableDraggableButton alloc]
+ initWithFrame:NSMakeRect(0, 0, 500, 500)]);
[[test_window() contentView] addSubview:button.get()];
NSEvent* downEvent =
cocoa_test_event_utils::MouseEventAtPoint(NSMakePoint(10,10),

Powered by Google App Engine
This is Rietveld 408576698