| Index: third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp
|
| diff --git a/third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp b/third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp
|
| index c2ea9ecc2e3f9455bb0ad4c5567968e2cfcaba84..451b1a56d9a60327d14ffb4d34dddbfb13f2f423 100644
|
| --- a/third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp
|
| +++ b/third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.cpp
|
| @@ -107,14 +107,14 @@ void InspectorDOMStorageAgent::disable(ErrorString*)
|
| controller->setInspectorAgent(nullptr);
|
| }
|
|
|
| -void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, PassOwnPtr<protocol::DOMStorage::StorageId> storageId, OwnPtr<protocol::Array<protocol::Array<String>>>* items)
|
| +void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, std::unique_ptr<protocol::DOMStorage::StorageId> storageId, std::unique_ptr<protocol::Array<protocol::Array<String>>>* items)
|
| {
|
| LocalFrame* frame;
|
| StorageArea* storageArea = findStorageArea(errorString, std::move(storageId), frame);
|
| if (!storageArea)
|
| return;
|
|
|
| - OwnPtr<protocol::Array<protocol::Array<String>>> storageItems = protocol::Array<protocol::Array<String>>::create();
|
| + std::unique_ptr<protocol::Array<protocol::Array<String>>> storageItems = protocol::Array<protocol::Array<String>>::create();
|
|
|
| TrackExceptionState exceptionState;
|
| for (unsigned i = 0; i < storageArea->length(exceptionState, frame); ++i) {
|
| @@ -124,7 +124,7 @@ void InspectorDOMStorageAgent::getDOMStorageItems(ErrorString* errorString, Pass
|
| String value(storageArea->getItem(name, exceptionState, frame));
|
| if (hadException(exceptionState, errorString))
|
| return;
|
| - OwnPtr<protocol::Array<String>> entry = protocol::Array<String>::create();
|
| + std::unique_ptr<protocol::Array<String>> entry = protocol::Array<String>::create();
|
| entry->addItem(name);
|
| entry->addItem(value);
|
| storageItems->addItem(std::move(entry));
|
| @@ -139,7 +139,7 @@ static String toErrorString(ExceptionState& exceptionState)
|
| return "";
|
| }
|
|
|
| -void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString* errorString, PassOwnPtr<protocol::DOMStorage::StorageId> storageId, const String& key, const String& value)
|
| +void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString* errorString, std::unique_ptr<protocol::DOMStorage::StorageId> storageId, const String& key, const String& value)
|
| {
|
| LocalFrame* frame;
|
| StorageArea* storageArea = findStorageArea(0, std::move(storageId), frame);
|
| @@ -153,7 +153,7 @@ void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString* errorString, PassO
|
| *errorString = toErrorString(exceptionState);
|
| }
|
|
|
| -void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString* errorString, PassOwnPtr<protocol::DOMStorage::StorageId> storageId, const String& key)
|
| +void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString* errorString, std::unique_ptr<protocol::DOMStorage::StorageId> storageId, const String& key)
|
| {
|
| LocalFrame* frame;
|
| StorageArea* storageArea = findStorageArea(0, std::move(storageId), frame);
|
| @@ -167,7 +167,7 @@ void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString* errorString, Pa
|
| *errorString = toErrorString(exceptionState);
|
| }
|
|
|
| -PassOwnPtr<protocol::DOMStorage::StorageId> InspectorDOMStorageAgent::storageId(SecurityOrigin* securityOrigin, bool isLocalStorage)
|
| +std::unique_ptr<protocol::DOMStorage::StorageId> InspectorDOMStorageAgent::storageId(SecurityOrigin* securityOrigin, bool isLocalStorage)
|
| {
|
| return protocol::DOMStorage::StorageId::create()
|
| .setSecurityOrigin(securityOrigin->toRawString())
|
| @@ -179,7 +179,7 @@ void InspectorDOMStorageAgent::didDispatchDOMStorageEvent(const String& key, con
|
| if (!frontend())
|
| return;
|
|
|
| - OwnPtr<protocol::DOMStorage::StorageId> id = storageId(securityOrigin, storageType == LocalStorage);
|
| + std::unique_ptr<protocol::DOMStorage::StorageId> id = storageId(securityOrigin, storageType == LocalStorage);
|
|
|
| if (key.isNull())
|
| frontend()->domStorageItemsCleared(std::move(id));
|
| @@ -191,7 +191,7 @@ void InspectorDOMStorageAgent::didDispatchDOMStorageEvent(const String& key, con
|
| frontend()->domStorageItemUpdated(std::move(id), key, oldValue, newValue);
|
| }
|
|
|
| -StorageArea* InspectorDOMStorageAgent::findStorageArea(ErrorString* errorString, PassOwnPtr<protocol::DOMStorage::StorageId> storageId, LocalFrame*& targetFrame)
|
| +StorageArea* InspectorDOMStorageAgent::findStorageArea(ErrorString* errorString, std::unique_ptr<protocol::DOMStorage::StorageId> storageId, LocalFrame*& targetFrame)
|
| {
|
| String securityOrigin = storageId->getSecurityOrigin();
|
| bool isLocalStorage = storageId->getIsLocalStorage();
|
|
|