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

Unified Diff: chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc

Issue 367403002: Add missing Pass() calls for passing scoped_ptrs on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: :-( Created 6 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/views/status_icons/status_tray_win_unittest.cc
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
index d302690acfaf55f94ad90a876e83d9b623a7d838..424982e42f53b062e52d41dd0b7ce5540609c1ae 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -135,12 +135,15 @@ TEST(StatusTrayWinTest, EnsureVisibleTest) {
FakeStatusTrayStateChangerProxy* proxy =
new FakeStatusTrayStateChangerProxy();
- tray.SetStatusTrayStateChangerProxyForTest(make_scoped_ptr(proxy));
+ tray.SetStatusTrayStateChangerProxyForTest(
+ scoped_ptr<StatusTrayStateChangerProxy>(proxy));
StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
icon->ForceVisible();
+ // |proxy| is owned by |tray|, and |tray| lives to the end of the scope,
+ // so calling methods on |proxy| is safe.
EXPECT_TRUE(proxy->enqueue_called());
EXPECT_EQ(proxy->window(), icon->window());
EXPECT_EQ(proxy->icon_id(), icon->icon_id());

Powered by Google App Engine
This is Rietveld 408576698