| Index: third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp b/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp
|
| index 03235b76a0555930acdac908fe3a9977908506b8..8a8ade04e6fc2a6ebe8979f3f77eae12340df431 100644
|
| --- a/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/cachestorage/CacheTest.cpp
|
| @@ -200,9 +200,13 @@ class ErrorWebCacheForTests : public WebServiceWorkerCache {
|
| const String expectedRequestUrl =
|
| KURL(expectedBatchOperations[i].request.url());
|
| EXPECT_EQ(expectedRequestUrl, KURL(batchOperations[i].request.url()));
|
| - const String expectedResponseUrl =
|
| - KURL(expectedBatchOperations[i].response.url());
|
| - EXPECT_EQ(expectedResponseUrl, KURL(batchOperations[i].response.url()));
|
| + EXPECT_EQ(expectedBatchOperations[i].response.urlList().size(),
|
| + batchOperations[i].response.urlList().size());
|
| + for (size_t j = 0;
|
| + j < expectedBatchOperations[i].response.urlList().size(); ++j) {
|
| + EXPECT_EQ(expectedBatchOperations[i].response.urlList()[j],
|
| + batchOperations[i].response.urlList()[j]);
|
| + }
|
| CompareQueryParamsForTest(expectedBatchOperations[i].matchParams,
|
| batchOperations[i].matchParams);
|
| }
|
| @@ -473,7 +477,9 @@ TEST_F(CacheStorageTest, BatchOperationArguments) {
|
| ASSERT(request);
|
|
|
| WebServiceWorkerResponse webResponse;
|
| - webResponse.setURL(KURL(ParsedURLString, url));
|
| + std::vector<KURL> urlList;
|
| + urlList.push_back(KURL(ParsedURLString, url));
|
| + webResponse.setURLList(urlList);
|
| Response* response = Response::create(getScriptState(), webResponse);
|
|
|
| WebVector<WebServiceWorkerCache::BatchOperation> expectedDeleteOperations(
|
| @@ -552,7 +558,9 @@ TEST_F(CacheStorageTest, MatchResponseTest) {
|
| const String responseUrl = "http://match.response.test/";
|
|
|
| WebServiceWorkerResponse webResponse;
|
| - webResponse.setURL(KURL(ParsedURLString, responseUrl));
|
| + std::vector<KURL> urlList;
|
| + urlList.push_back(KURL(ParsedURLString, responseUrl));
|
| + webResponse.setURLList(urlList);
|
| webResponse.setResponseType(WebServiceWorkerResponseTypeDefault);
|
|
|
| Cache* cache = createCache(fetcher, new MatchTestCache(webResponse));
|
| @@ -654,9 +662,13 @@ TEST_F(CacheStorageTest, MatchAllAndBatchResponseTest) {
|
| expectedUrls[1] = url2;
|
|
|
| WebVector<WebServiceWorkerResponse> webResponses(size_t(2));
|
| - webResponses[0].setURL(KURL(ParsedURLString, url1));
|
| + std::vector<KURL> urlList1;
|
| + urlList1.push_back(KURL(ParsedURLString, url1));
|
| + webResponses[0].setURLList(urlList1);
|
| webResponses[0].setResponseType(WebServiceWorkerResponseTypeDefault);
|
| - webResponses[1].setURL(KURL(ParsedURLString, url2));
|
| + std::vector<KURL> urlList2;
|
| + urlList2.push_back(KURL(ParsedURLString, url2));
|
| + webResponses[1].setURLList(urlList2);
|
| webResponses[1].setResponseType(WebServiceWorkerResponseTypeDefault);
|
|
|
| Cache* cache =
|
|
|