| 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..ad32e9d9b4819ecbb116383a8579b8944a1894af 100644
|
| --- a/content/renderer/cache_storage/cache_storage_dispatcher.cc
|
| +++ b/content/renderer/cache_storage/cache_storage_dispatcher.cc
|
| @@ -99,7 +99,7 @@ CacheStorageCacheQueryParams QueryParamsFromWebQueryParams(
|
| query_params.ignore_search = web_query_params.ignoreSearch;
|
| query_params.ignore_method = web_query_params.ignoreMethod;
|
| query_params.ignore_vary = web_query_params.ignoreVary;
|
| - query_params.cache_name = web_query_params.cacheName;
|
| + query_params.cache_name = web_query_params.cacheName.utf8();
|
| return query_params;
|
| }
|
|
|
| @@ -320,11 +320,11 @@ void CacheStorageDispatcher::OnCacheStorageDeleteSuccess(int thread_id,
|
| void CacheStorageDispatcher::OnCacheStorageKeysSuccess(
|
| int thread_id,
|
| int request_id,
|
| - const std::vector<base::string16>& keys) {
|
| + const std::vector<std::string>& keys) {
|
| DCHECK_EQ(thread_id, CurrentWorkerId());
|
| blink::WebVector<blink::WebString> webKeys(keys.size());
|
| for (size_t i = 0; i < keys.size(); ++i)
|
| - webKeys[i] = keys[i];
|
| + webKeys[i] = blink::WebString::fromUTF8Lenient(keys[i]);
|
|
|
| UMA_HISTOGRAM_TIMES("ServiceWorkerCache.CacheStorage.Keys",
|
| TimeTicks::Now() - keys_times_[request_id]);
|
| @@ -528,7 +528,7 @@ void CacheStorageDispatcher::dispatchHas(
|
| int request_id = has_callbacks_.Add(callbacks);
|
| has_times_[request_id] = base::TimeTicks::Now();
|
| Send(new CacheStorageHostMsg_CacheStorageHas(CurrentWorkerId(), request_id,
|
| - origin, cacheName));
|
| + origin, cacheName.utf8()));
|
| }
|
|
|
| void CacheStorageDispatcher::dispatchOpen(
|
| @@ -538,7 +538,7 @@ void CacheStorageDispatcher::dispatchOpen(
|
| int request_id = open_callbacks_.Add(callbacks);
|
| open_times_[request_id] = base::TimeTicks::Now();
|
| Send(new CacheStorageHostMsg_CacheStorageOpen(CurrentWorkerId(), request_id,
|
| - origin, cacheName));
|
| + origin, cacheName.utf8()));
|
| }
|
|
|
| void CacheStorageDispatcher::dispatchDelete(
|
| @@ -548,7 +548,7 @@ void CacheStorageDispatcher::dispatchDelete(
|
| int request_id = delete_callbacks_.Add(callbacks);
|
| delete_times_[request_id] = base::TimeTicks::Now();
|
| Send(new CacheStorageHostMsg_CacheStorageDelete(CurrentWorkerId(), request_id,
|
| - origin, cacheName));
|
| + origin, cacheName.utf8()));
|
| }
|
|
|
| void CacheStorageDispatcher::dispatchKeys(
|
|
|