| Index: third_party/WebKit/Source/web/LocalFileSystemClient.cpp
|
| diff --git a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
|
| index 76e1690849dd53ae1a2c518250e49d5c25d410b7..ad431ca5bf78e81bb21084aca519590fb4cd4687 100644
|
| --- a/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
|
| +++ b/third_party/WebKit/Source/web/LocalFileSystemClient.cpp
|
| @@ -38,15 +38,13 @@
|
| #include "public/web/WebContentSettingsClient.h"
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WorkerContentSettingsClient.h"
|
| -#include "wtf/PtrUtil.h"
|
| #include "wtf/text/WTFString.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| -std::unique_ptr<FileSystemClient> LocalFileSystemClient::create()
|
| +PassOwnPtr<FileSystemClient> LocalFileSystemClient::create()
|
| {
|
| - return wrapUnique(static_cast<FileSystemClient*>(new LocalFileSystemClient()));
|
| + return adoptPtr(static_cast<FileSystemClient*>(new LocalFileSystemClient()));
|
| }
|
|
|
| LocalFileSystemClient::~LocalFileSystemClient()
|
| @@ -65,7 +63,7 @@ bool LocalFileSystemClient::requestFileSystemAccessSync(ExecutionContext* contex
|
| return WorkerContentSettingsClient::from(*toWorkerGlobalScope(context))->requestFileSystemAccessSync();
|
| }
|
|
|
| -void LocalFileSystemClient::requestFileSystemAccessAsync(ExecutionContext* context, std::unique_ptr<ContentSettingCallbacks> callbacks)
|
| +void LocalFileSystemClient::requestFileSystemAccessAsync(ExecutionContext* context, PassOwnPtr<ContentSettingCallbacks> callbacks)
|
| {
|
| DCHECK(context);
|
| if (!context->isDocument()) {
|
|
|