| Index: content/renderer/cache_storage/cache_storage_dispatcher.cc
|
| diff --git a/content/renderer/cache_storage/cache_storage_dispatcher.cc b/content/renderer/cache_storage/cache_storage_dispatcher.cc
|
| index b20d19eef385616c07c76395e915a49f151c3a8b..9cf89c9067cb38ab8c587f3b52606a03cffd30ab 100644
|
| --- a/content/renderer/cache_storage/cache_storage_dispatcher.cc
|
| +++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
|
| @@ -23,6 +23,7 @@
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerCache.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerRequest.h"
|
| #include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerResponse.h"
|
| +#include "url/origin.h"
|
|
|
| using base::TimeTicks;
|
|
|
| @@ -523,7 +524,7 @@ void CacheStorageDispatcher::OnCacheBatchError(
|
|
|
| void CacheStorageDispatcher::dispatchHas(
|
| WebServiceWorkerCacheStorage::CacheStorageCallbacks* callbacks,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const blink::WebString& cacheName) {
|
| int request_id = has_callbacks_.Add(callbacks);
|
| has_times_[request_id] = base::TimeTicks::Now();
|
| @@ -533,7 +534,7 @@ void CacheStorageDispatcher::dispatchHas(
|
|
|
| void CacheStorageDispatcher::dispatchOpen(
|
| WebServiceWorkerCacheStorage::CacheStorageWithCacheCallbacks* callbacks,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const blink::WebString& cacheName) {
|
| int request_id = open_callbacks_.Add(callbacks);
|
| open_times_[request_id] = base::TimeTicks::Now();
|
| @@ -543,7 +544,7 @@ void CacheStorageDispatcher::dispatchOpen(
|
|
|
| void CacheStorageDispatcher::dispatchDelete(
|
| WebServiceWorkerCacheStorage::CacheStorageCallbacks* callbacks,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const blink::WebString& cacheName) {
|
| int request_id = delete_callbacks_.Add(callbacks);
|
| delete_times_[request_id] = base::TimeTicks::Now();
|
| @@ -553,7 +554,7 @@ void CacheStorageDispatcher::dispatchDelete(
|
|
|
| void CacheStorageDispatcher::dispatchKeys(
|
| WebServiceWorkerCacheStorage::CacheStorageKeysCallbacks* callbacks,
|
| - const GURL& origin) {
|
| + const url::Origin& origin) {
|
| int request_id = keys_callbacks_.Add(callbacks);
|
| keys_times_[request_id] = base::TimeTicks::Now();
|
| Send(new CacheStorageHostMsg_CacheStorageKeys(CurrentWorkerId(), request_id,
|
| @@ -562,7 +563,7 @@ void CacheStorageDispatcher::dispatchKeys(
|
|
|
| void CacheStorageDispatcher::dispatchMatch(
|
| WebServiceWorkerCacheStorage::CacheStorageMatchCallbacks* callbacks,
|
| - const GURL& origin,
|
| + const url::Origin& origin,
|
| const blink::WebServiceWorkerRequest& request,
|
| const blink::WebServiceWorkerCache::QueryParams& query_params) {
|
| int request_id = match_callbacks_.Add(callbacks);
|
|
|