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

Unified Diff: chrome/browser/ui/cocoa/history_overlay_controller_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/history_overlay_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
index 491bf24d5efd5835ed9c0ba7f5dd950fb0fa3539..96ab9158e23dd6931507b94493b720f892a2bcac 100644
--- a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm
@@ -28,7 +28,7 @@ class HistoryOverlayControllerTest : public CocoaTest {
}
private:
- scoped_nsobject<NSView> test_view_;
+ base::scoped_nsobject<NSView> test_view_;
};
// Tests that the controller's view gets removed from the hierarchy when the
@@ -37,7 +37,7 @@ TEST_F(HistoryOverlayControllerTest, RemovedViewWhenDeallocated) {
NSView* content_view = [test_window() contentView];
EXPECT_EQ(1u, [[content_view subviews] count]);
- scoped_nsobject<HistoryOverlayController> controller(
+ base::scoped_nsobject<HistoryOverlayController> controller(
[[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
[controller showPanelForView:test_view()];
EXPECT_EQ(2u, [[content_view subviews] count]);
@@ -49,7 +49,7 @@ TEST_F(HistoryOverlayControllerTest, RemovedViewWhenDeallocated) {
// Tests that when the controller is |-dismiss|ed, the animation runs and then
// is removed when the animation completes.
TEST_F(HistoryOverlayControllerTest, DismissClearsAnimations) {
- scoped_nsobject<HistoryOverlayController> controller(
+ base::scoped_nsobject<HistoryOverlayController> controller(
[[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
[controller showPanelForView:test_view()];

Powered by Google App Engine
This is Rietveld 408576698