Index: ui/base/cocoa/tracking_area_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/tracking_area_unittest.mm b/ui/base/cocoa/tracking_area_unittest.mm |
similarity index 91% |
rename from chrome/browser/ui/cocoa/tracking_area_unittest.mm |
rename to ui/base/cocoa/tracking_area_unittest.mm |
index 27e572d4c996417f806dcbff53a289cf58c86ea3..50927c8bc99366dac46c33c311a8c1ab1ac64397 100644 |
--- a/chrome/browser/ui/cocoa/tracking_area_unittest.mm |
+++ b/ui/base/cocoa/tracking_area_unittest.mm |
@@ -3,8 +3,8 @@ |
// found in the LICENSE file. |
#include "base/memory/scoped_nsobject.h" |
-#include "chrome/browser/ui/cocoa/cocoa_test_helper.h" |
-#import "chrome/browser/ui/cocoa/tracking_area.h" |
+#import "ui/base/cocoa/tracking_area.h" |
+#import "ui/base/test/ui_cocoa_test_helper.h" |
// A test object that counts the number of times a message is sent to it. |
@interface TestTrackingAreaOwner : NSObject { |
@@ -22,7 +22,7 @@ |
} |
@end |
-class CrTrackingAreaTest : public CocoaTest { |
+class CrTrackingAreaTest : public ui::CocoaTest { |
Nico
2013/03/11 17:42:45
nit: Aren't tests usually in the same namespace as
tapted
2013/03/11 22:40:22
Good point. Done.
|
public: |
CrTrackingAreaTest() |
: owner_([[TestTrackingAreaOwner alloc] init]), |
@@ -70,7 +70,7 @@ TEST_F(CrTrackingAreaTest, OwnerAutomaticallyStopsForwardingOnClose) { |
TEST_F(CrTrackingAreaTest, ScoperInit) { |
{ |
- ScopedCrTrackingArea scoper([trackingArea_ retain]); |
+ ui::ScopedCrTrackingArea scoper([trackingArea_ retain]); |
[[scoper.get() owner] performMessage]; |
EXPECT_EQ(1U, [owner_ messageCount]); |
} |
@@ -81,7 +81,7 @@ TEST_F(CrTrackingAreaTest, ScoperInit) { |
TEST_F(CrTrackingAreaTest, ScoperReset) { |
{ |
- ScopedCrTrackingArea scoper; |
+ ui::ScopedCrTrackingArea scoper; |
EXPECT_FALSE(scoper.get()); |
scoper.reset([trackingArea_ retain]); |