| Index: chrome/utility/importer/edge_importer_win.cc
|
| diff --git a/chrome/utility/importer/edge_importer_win.cc b/chrome/utility/importer/edge_importer_win.cc
|
| index 7421f7e9eea3938d2a2bdcbb6cc9fce09d7a7d2e..39097279b3eb197256323f12073d4e0379a2ee01 100644
|
| --- a/chrome/utility/importer/edge_importer_win.cc
|
| +++ b/chrome/utility/importer/edge_importer_win.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include <algorithm>
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <tuple>
|
| #include <vector>
|
| @@ -16,7 +17,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/time/time.h"
|
| @@ -215,7 +215,7 @@ void EdgeImporter::ParseFavoritesDatabase(
|
| return;
|
| }
|
|
|
| - scoped_ptr<EdgeDatabaseTableEnumerator> enumerator =
|
| + std::unique_ptr<EdgeDatabaseTableEnumerator> enumerator =
|
| database.OpenTableEnumerator(L"Favorites");
|
| if (!enumerator) {
|
| DVLOG(1) << "Error opening database table " << database.GetErrorMessage();
|
|
|