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

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

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. Created 4 years, 8 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 bec05ca3d209dfb746f494f3fce26bd4394b6dc9..14f387a9d8c4f24817bdffd8095e61e6d1886f12 100644
--- a/chrome/installer/util/firewall_manager_win.cc
+++ b/chrome/installer/util/firewall_manager_win.cc
@@ -103,17 +103,17 @@ class FirewallManagerLegacyImpl : public FirewallManager {
FirewallManager::~FirewallManager() {}
// static
-scoped_ptr<FirewallManager> FirewallManager::Create(
+std::unique_ptr<FirewallManager> FirewallManager::Create(
BrowserDistribution* dist,
const base::FilePath& chrome_path) {
// First try to connect to "Windows Firewall with Advanced Security" (Vista+).
- scoped_ptr<FirewallManagerAdvancedImpl> manager(
+ std::unique_ptr<FirewallManagerAdvancedImpl> manager(
new FirewallManagerAdvancedImpl());
if (manager->Init(dist->GetDisplayName(), chrome_path))
return std::move(manager);
// Next try to connect to "Windows Firewall for Windows XP with SP2".
- scoped_ptr<FirewallManagerLegacyImpl> legacy_manager(
+ std::unique_ptr<FirewallManagerLegacyImpl> legacy_manager(
new FirewallManagerLegacyImpl());
if (legacy_manager->Init(dist->GetDisplayName(), chrome_path))
return std::move(legacy_manager);
« no previous file with comments | « chrome/installer/util/firewall_manager_win.h ('k') | chrome/installer/util/google_chrome_binaries_distribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698