| Index: third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| index 4e5a54f073975897734092e5b2e0f81d113434d2..b25685c2ec24f5a4802974cf50c18d28af8335f3 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorApplicationCacheAgent.cpp
|
| @@ -87,7 +87,7 @@ void InspectorApplicationCacheAgent::networkStateChanged(LocalFrame* frame, bool
|
| frontend()->networkStateUpdated(online);
|
| }
|
|
|
| -void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, OwnPtr<protocol::Array<protocol::ApplicationCache::FrameWithManifest>>* result)
|
| +void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, std::unique_ptr<protocol::Array<protocol::ApplicationCache::FrameWithManifest>>* result)
|
| {
|
| *result = protocol::Array<protocol::ApplicationCache::FrameWithManifest>::create();
|
|
|
| @@ -100,7 +100,7 @@ void InspectorApplicationCacheAgent::getFramesWithManifests(ErrorString*, OwnPtr
|
| ApplicationCacheHost::CacheInfo info = host->applicationCacheInfo();
|
| String manifestURL = info.m_manifest.getString();
|
| if (!manifestURL.isEmpty()) {
|
| - OwnPtr<protocol::ApplicationCache::FrameWithManifest> value = protocol::ApplicationCache::FrameWithManifest::create()
|
| + std::unique_ptr<protocol::ApplicationCache::FrameWithManifest> value = protocol::ApplicationCache::FrameWithManifest::create()
|
| .setFrameId(IdentifiersFactory::frameId(frame))
|
| .setManifestURL(manifestURL)
|
| .setStatus(static_cast<int>(host->getStatus())).build();
|
| @@ -133,7 +133,7 @@ void InspectorApplicationCacheAgent::getManifestForFrame(ErrorString* errorStrin
|
| *manifestURL = info.m_manifest.getString();
|
| }
|
|
|
| -void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, OwnPtr<protocol::ApplicationCache::ApplicationCache>* applicationCache)
|
| +void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* errorString, const String& frameId, std::unique_ptr<protocol::ApplicationCache::ApplicationCache>* applicationCache)
|
| {
|
| DocumentLoader* documentLoader = assertFrameWithDocumentLoader(errorString, frameId);
|
| if (!documentLoader)
|
| @@ -148,7 +148,7 @@ void InspectorApplicationCacheAgent::getApplicationCacheForFrame(ErrorString* er
|
| *applicationCache = buildObjectForApplicationCache(resources, info);
|
| }
|
|
|
| -PassOwnPtr<protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
|
| +std::unique_ptr<protocol::ApplicationCache::ApplicationCache> InspectorApplicationCacheAgent::buildObjectForApplicationCache(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources, const ApplicationCacheHost::CacheInfo& applicationCacheInfo)
|
| {
|
| return protocol::ApplicationCache::ApplicationCache::create()
|
| .setManifestURL(applicationCacheInfo.m_manifest.getString())
|
| @@ -159,9 +159,9 @@ PassOwnPtr<protocol::ApplicationCache::ApplicationCache> InspectorApplicationCac
|
| .build();
|
| }
|
|
|
| -PassOwnPtr<protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
|
| +std::unique_ptr<protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>> InspectorApplicationCacheAgent::buildArrayForApplicationCacheResources(const ApplicationCacheHost::ResourceInfoList& applicationCacheResources)
|
| {
|
| - OwnPtr<protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>> resources = protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>::create();
|
| + std::unique_ptr<protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>> resources = protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>::create();
|
|
|
| ApplicationCacheHost::ResourceInfoList::const_iterator end = applicationCacheResources.end();
|
| ApplicationCacheHost::ResourceInfoList::const_iterator it = applicationCacheResources.begin();
|
| @@ -171,7 +171,7 @@ PassOwnPtr<protocol::Array<protocol::ApplicationCache::ApplicationCacheResource>
|
| return resources;
|
| }
|
|
|
| -PassOwnPtr<protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
|
| +std::unique_ptr<protocol::ApplicationCache::ApplicationCacheResource> InspectorApplicationCacheAgent::buildObjectForApplicationCacheResource(const ApplicationCacheHost::ResourceInfo& resourceInfo)
|
| {
|
| StringBuilder builder;
|
| if (resourceInfo.m_isMaster)
|
| @@ -189,7 +189,7 @@ PassOwnPtr<protocol::ApplicationCache::ApplicationCacheResource> InspectorApplic
|
| if (resourceInfo.m_isExplicit)
|
| builder.appendLiteral("Explicit ");
|
|
|
| - OwnPtr<protocol::ApplicationCache::ApplicationCacheResource> value = protocol::ApplicationCache::ApplicationCacheResource::create()
|
| + std::unique_ptr<protocol::ApplicationCache::ApplicationCacheResource> value = protocol::ApplicationCache::ApplicationCacheResource::create()
|
| .setUrl(resourceInfo.m_resource.getString())
|
| .setSize(static_cast<int>(resourceInfo.m_size))
|
| .setType(builder.toString()).build();
|
|
|