| Index: chrome/browser/extensions/blob_reader.h
|
| diff --git a/chrome/browser/extensions/blob_reader.h b/chrome/browser/extensions/blob_reader.h
|
| index 1cf464b86924ddb2d957d20deb963e34d7064e39..4c0076a9c19de0f38d53e37a8c7183cfdb22d088 100644
|
| --- a/chrome/browser/extensions/blob_reader.h
|
| +++ b/chrome/browser/extensions/blob_reader.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/io_buffer.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| #include "net/url_request/url_request.h"
|
| @@ -28,8 +28,9 @@ class BlobReader : public net::URLFetcherDelegate {
|
| // |blob_data| contains the portion of the Blob requested. |blob_total_size|
|
| // is the total size of the Blob, and may be larger than |blob_data->size()|.
|
| // |blob_total_size| is -1 if it cannot be determined.
|
| - typedef base::Callback<void(scoped_ptr<std::string> blob_data,
|
| - int64_t blob_total_size)> BlobReadCallback;
|
| + typedef base::Callback<void(std::unique_ptr<std::string> blob_data,
|
| + int64_t blob_total_size)>
|
| + BlobReadCallback;
|
|
|
| BlobReader(Profile* profile,
|
| const std::string& blob_uuid,
|
| @@ -45,7 +46,7 @@ class BlobReader : public net::URLFetcherDelegate {
|
| void OnURLFetchComplete(const net::URLFetcher* source) override;
|
|
|
| BlobReadCallback callback_;
|
| - scoped_ptr<net::URLFetcher> fetcher_;
|
| + std::unique_ptr<net::URLFetcher> fetcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlobReader);
|
| };
|
|
|