| Index: chrome/browser/extensions/api/file_handlers/directory_util.h
|
| diff --git a/chrome/browser/extensions/api/file_handlers/directory_util.h b/chrome/browser/extensions/api/file_handlers/directory_util.h
|
| index ec87d0110392e5e04c1195a8bc848d30d1f7f4c7..5ed26be66c64032e0a5e5f94fcc812ea5966ff10 100644
|
| --- a/chrome/browser/extensions/api/file_handlers/directory_util.h
|
| +++ b/chrome/browser/extensions/api/file_handlers/directory_util.h
|
| @@ -5,13 +5,13 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_FILE_HANDLERS_DIRECTORY_UTIL_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_FILE_HANDLERS_DIRECTORY_UTIL_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
|
|
| class Profile;
|
| @@ -29,7 +29,7 @@ namespace app_file_handler_util {
|
|
|
| class IsDirectoryCollector {
|
| public:
|
| - typedef base::Callback<void(scoped_ptr<std::set<base::FilePath>>)>
|
| + typedef base::Callback<void(std::unique_ptr<std::set<base::FilePath>>)>
|
| CompletionCallback;
|
|
|
| explicit IsDirectoryCollector(Profile* profile);
|
| @@ -45,7 +45,7 @@ class IsDirectoryCollector {
|
|
|
| Profile* profile_;
|
| std::vector<base::FilePath> paths_;
|
| - scoped_ptr<std::set<base::FilePath>> result_;
|
| + std::unique_ptr<std::set<base::FilePath>> result_;
|
| size_t left_;
|
| CompletionCallback callback_;
|
| base::WeakPtrFactory<IsDirectoryCollector> weak_ptr_factory_;
|
|
|