Index: chrome/browser/chromeos/file_system_provider/throttled_file_system.h |
diff --git a/chrome/browser/chromeos/file_system_provider/throttled_file_system.h b/chrome/browser/chromeos/file_system_provider/throttled_file_system.h |
index 8f9563f06c04abf06fde96fbc7a155c4eee2562e..a5678d7c1274837491676839c26baf2f81d04e0e 100644 |
--- a/chrome/browser/chromeos/file_system_provider/throttled_file_system.h |
+++ b/chrome/browser/chromeos/file_system_provider/throttled_file_system.h |
@@ -7,12 +7,12 @@ |
#include <stdint.h> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "chrome/browser/chromeos/file_system_provider/abort_callback.h" |
#include "chrome/browser/chromeos/file_system_provider/provided_file_system.h" |
@@ -43,7 +43,7 @@ class RequestManager; |
class ThrottledFileSystem : public ProvidedFileSystemInterface { |
public: |
explicit ThrottledFileSystem( |
- scoped_ptr<ProvidedFileSystemInterface> file_system); |
+ std::unique_ptr<ProvidedFileSystemInterface> file_system); |
~ThrottledFileSystem() override; |
// ProvidedFileSystemInterface overrides. |
@@ -123,7 +123,7 @@ class ThrottledFileSystem : public ProvidedFileSystemInterface { |
void Notify(const base::FilePath& entry_path, |
bool recursive, |
storage::WatcherManager::ChangeType change_type, |
- scoped_ptr<ProvidedFileSystemObserver::Changes> changes, |
+ std::unique_ptr<ProvidedFileSystemObserver::Changes> changes, |
const std::string& tag, |
const storage::AsyncFileUtil::StatusCallback& callback) override; |
void Configure( |
@@ -146,8 +146,8 @@ class ThrottledFileSystem : public ProvidedFileSystemInterface { |
const storage::AsyncFileUtil::StatusCallback& callback, |
base::File::Error result); |
- scoped_ptr<ProvidedFileSystemInterface> file_system_; |
- scoped_ptr<Queue> open_queue_; |
+ std::unique_ptr<ProvidedFileSystemInterface> file_system_; |
+ std::unique_ptr<Queue> open_queue_; |
// Map from file handles to open queue tokens. |
std::map<int, int> opened_files_; |