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

Unified Diff: chrome/installer/util/firewall_manager_win.cc

Issue 657313003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/installer/util/firewall_manager_win.cc
diff --git a/chrome/installer/util/firewall_manager_win.cc b/chrome/installer/util/firewall_manager_win.cc
index 3ec15b57f18c5412a79560a76223d3a4f36612a0..0171a6f2d07ac0893be2b59a893197bbb4a5de05 100644
--- a/chrome/installer/util/firewall_manager_win.cc
+++ b/chrome/installer/util/firewall_manager_win.cc
@@ -106,13 +106,13 @@ scoped_ptr<FirewallManager> FirewallManager::Create(
scoped_ptr<FirewallManagerAdvancedImpl> manager(
new FirewallManagerAdvancedImpl());
if (manager->Init(dist->GetDisplayName(), chrome_path))
- return manager.PassAs<FirewallManager>();
+ return manager.Pass();
// Next try to connect to "Windows Firewall for Windows XP with SP2".
scoped_ptr<FirewallManagerLegacyImpl> legacy_manager(
new FirewallManagerLegacyImpl());
if (legacy_manager->Init(dist->GetDisplayName(), chrome_path))
- return legacy_manager.PassAs<FirewallManager>();
+ return legacy_manager.Pass();
return scoped_ptr<FirewallManager>();
}

Powered by Google App Engine
This is Rietveld 408576698