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 8c517bd98e77ff7e1c508568e7668d0f11858cb1..bec05ca3d209dfb746f494f3fce26bd4394b6dc9 100644 |
--- a/chrome/installer/util/firewall_manager_win.cc |
+++ b/chrome/installer/util/firewall_manager_win.cc |
@@ -6,6 +6,8 @@ |
#include <stdint.h> |
+#include <utility> |
+ |
#include "base/files/file_path.h" |
#include "base/macros.h" |
#include "base/strings/string16.h" |
@@ -108,15 +110,15 @@ scoped_ptr<FirewallManager> FirewallManager::Create( |
scoped_ptr<FirewallManagerAdvancedImpl> manager( |
new FirewallManagerAdvancedImpl()); |
if (manager->Init(dist->GetDisplayName(), chrome_path)) |
- return manager.Pass(); |
+ return std::move(manager); |
// 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.Pass(); |
+ return std::move(legacy_manager); |
- return scoped_ptr<FirewallManager>(); |
+ return nullptr; |
} |
FirewallManager::FirewallManager() { |