Index: chrome/installer/util/installer_state.h |
diff --git a/chrome/installer/util/installer_state.h b/chrome/installer/util/installer_state.h |
index 47915099604b93bfc1c069f05ebf408d90b77616..7e1f68879df8e8f50a5c43a16956029a69b0e31d 100644 |
--- a/chrome/installer/util/installer_state.h |
+++ b/chrome/installer/util/installer_state.h |
@@ -7,6 +7,7 @@ |
#include <stdint.h> |
+#include <memory> |
#include <set> |
#include <string> |
#include <vector> |
@@ -14,7 +15,6 @@ |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/strings/string16.h" |
#include "base/version.h" |
@@ -94,7 +94,7 @@ class InstallerState { |
// Returns the product that was added, or NULL if |product| is incompatible |
// with this object. Ownership of |product| is taken by this object, while |
// ownership of the return value is not passed to the caller. |
- Product* AddProduct(scoped_ptr<Product>* product); |
+ Product* AddProduct(std::unique_ptr<Product>* product); |
// Removes |product| from the set of products to be operated on. The object |
// pointed to by |product| is freed. Returns false if |product| is not |
@@ -241,7 +241,7 @@ class InstallerState { |
bool CanAddProduct(const Product& product, |
const base::FilePath* product_dir) const; |
Product* AddProductInDirectory(const base::FilePath* product_dir, |
- scoped_ptr<Product>* product); |
+ std::unique_ptr<Product>* product); |
Product* AddProductFromPreferences( |
BrowserDistribution::Type distribution_type, |
const MasterPreferences& prefs, |