Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
index 025caaead83d1ba737b0c708abbcf7e91fd4279d..cf230d10f0e3651619f93ca308d487d6ac2f713c 100644 |
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm |
@@ -93,7 +93,7 @@ class TabStripControllerTest : public CocoaProfileTest { |
// Create the "switch view" (view that gets changed out when a tab |
// switches). |
NSRect switch_frame = NSMakeRect(0, 0, content_frame.size.width, 500); |
- scoped_nsobject<NSView> switch_view( |
+ base::scoped_nsobject<NSView> switch_view( |
[[NSView alloc] initWithFrame:switch_frame]); |
[parent addSubview:switch_view.get()]; |
@@ -105,7 +105,7 @@ class TabStripControllerTest : public CocoaProfileTest { |
[[TabStripView alloc] initWithFrame:strip_frame]); |
[parent addSubview:tab_strip_.get()]; |
NSRect button_frame = NSMakeRect(0, 0, 15, 15); |
- scoped_nsobject<NewTabButton> new_tab_button( |
+ base::scoped_nsobject<NewTabButton> new_tab_button( |
[[NewTabButton alloc] initWithFrame:button_frame]); |
[tab_strip_ addSubview:new_tab_button.get()]; |
[tab_strip_ setNewTabButton:new_tab_button.get()]; |
@@ -152,9 +152,9 @@ class TabStripControllerTest : public CocoaProfileTest { |
scoped_ptr<TestTabStripModelDelegate> delegate_; |
TabStripModel* model_; |
- scoped_nsobject<TestTabStripControllerDelegate> controller_delegate_; |
- scoped_nsobject<TabStripController> controller_; |
- scoped_nsobject<TabStripView> tab_strip_; |
+ base::scoped_nsobject<TestTabStripControllerDelegate> controller_delegate_; |
+ base::scoped_nsobject<TabStripController> controller_; |
+ base::scoped_nsobject<TabStripView> tab_strip_; |
}; |
// Test adding and removing tabs and making sure that views get added to |
@@ -240,10 +240,9 @@ TEST_F(TabStripControllerTest, TabCloseDuringDrag) { |
// Schedule a task to close all the tabs and stop the drag, before the call to |
// -maybeStartDrag:forTab:, which starts a nested event loop. This task will |
// run in that nested event loop, which shouldn't crash. |
- scoped_nsobject<TestClosureRunner> runner( |
- [[TestClosureRunner alloc] initWithClosure: |
- base::Bind(&TabStripControllerTest::CloseTabsAndEndDrag, |
- base::Unretained(this))]); |
+ base::scoped_nsobject<TestClosureRunner> runner([[TestClosureRunner alloc] |
+ initWithClosure:base::Bind(&TabStripControllerTest::CloseTabsAndEndDrag, |
+ base::Unretained(this))]); |
[runner scheduleDelayedRun]; |
NSEvent* event = |