diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 19:18:36 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 19:18:36 +0000 |
| commit | 4252f6098889f2c5a8649d1688b269e53a51d42d (patch) | |
| tree | bbb1040a665b91ac297685ee6b7add579822a911 /webkit/appcache/appcache_url_request_job_unittest.cc | |
| parent | 29a6c9738ebb608d40567189452fd9c19f55569c (diff) | |
| download | chromium_src-4252f6098889f2c5a8649d1688b269e53a51d42d.zip chromium_src-4252f6098889f2c5a8649d1688b269e53a51d42d.tar.gz chromium_src-4252f6098889f2c5a8649d1688b269e53a51d42d.tar.bz2 | |
More groundwork for filestream based response storage.
This CL touches many files, but it amounts to mindless plumbing of a group_id value.
This doesn't involve any new database or fileio or task scheduling.
In order to read or write a response, callers now need to provide the group_id of
the corresponding manifest, so the AppCacheStorage CreateRepsonseReader() and
CreateResponseWriter() methods now take this additional parameter.
The current disk_cache based impl doesn't use this param for anything, but the
filestream based impl will use it to keep responses for a group in a particular
subdirectory.
When looking up the main resource for a page load via FindResponseForMainRequest,
the group_id needs to be returned so the response may later be read, the
AppCacheStorage::Delegate OnMainResponseFound() method has a param for that.
A bunch of callsites, tests, and mocks are updated accordingly.
BUG=78359
Review URL: http://codereview.chromium.org/8343018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_url_request_job_unittest.cc')
| -rw-r--r-- | webkit/appcache/appcache_url_request_job_unittest.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc index 9f406ca..eadac53 100644 --- a/webkit/appcache/appcache_url_request_job_unittest.cc +++ b/webkit/appcache/appcache_url_request_job_unittest.cc @@ -436,13 +436,16 @@ class AppCacheURLRequestJobTest : public testing::Test { job = new AppCacheURLRequestJob(&request, storage); const GURL kManifestUrl("http://blah/"); const int64 kCacheId(1); + const int64 kGroupId(1); const AppCacheEntry kEntry(AppCacheEntry::EXPLICIT, 1); - job->DeliverAppCachedResponse(kManifestUrl, kCacheId, kEntry, false); + job->DeliverAppCachedResponse(kManifestUrl, kCacheId, kGroupId, + kEntry, false); EXPECT_FALSE(job->is_waiting()); EXPECT_TRUE(job->is_delivering_appcache_response()); EXPECT_FALSE(job->has_been_started()); EXPECT_EQ(kManifestUrl, job->manifest_url()); EXPECT_EQ(kCacheId, job->cache_id()); + EXPECT_EQ(kGroupId, job->group_id()); EXPECT_EQ(kEntry.types(), job->entry().types()); EXPECT_EQ(kEntry.response_id(), job->entry().response_id()); @@ -527,7 +530,7 @@ class AppCacheURLRequestJobTest : public testing::Test { PushNextTask(NewRunnableMethod( this, &AppCacheURLRequestJobTest::RequestAppCachedResource, false)); - writer_.reset(service_->storage()->CreateResponseWriter(GURL())); + writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0)); written_response_id_ = writer_->response_id(); WriteBasicResponse(); // Continues async @@ -545,7 +548,7 @@ class AppCacheURLRequestJobTest : public testing::Test { if (start_after_delivery_orders) { job->DeliverAppCachedResponse( - GURL(), 111, + GURL(), 0, 111, AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_), false); EXPECT_TRUE(job->is_delivering_appcache_response()); @@ -560,7 +563,7 @@ class AppCacheURLRequestJobTest : public testing::Test { if (!start_after_delivery_orders) { job->DeliverAppCachedResponse( - GURL(), 111, + GURL(), 0, 111, AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_), false); EXPECT_TRUE(job->is_delivering_appcache_response()); @@ -595,7 +598,7 @@ class AppCacheURLRequestJobTest : public testing::Test { PushNextTask(NewRunnableMethod( this, &AppCacheURLRequestJobTest::RequestAppCachedResource, true)); - writer_.reset(service_->storage()->CreateResponseWriter(GURL())); + writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0)); written_response_id_ = writer_->response_id(); WriteLargeResponse(); // Continues async @@ -636,7 +639,7 @@ class AppCacheURLRequestJobTest : public testing::Test { this, &AppCacheURLRequestJobTest::VerifyDeliverPartialResponse)); PushNextTask(NewRunnableMethod( this, &AppCacheURLRequestJobTest::MakeRangeRequest)); - writer_.reset(service_->storage()->CreateResponseWriter(GURL())); + writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0)); written_response_id_ = writer_->response_id(); WriteBasicResponse(); // Continues async @@ -656,7 +659,7 @@ class AppCacheURLRequestJobTest : public testing::Test { scoped_refptr<AppCacheURLRequestJob> job( new AppCacheURLRequestJob(request_.get(), storage)); job->DeliverAppCachedResponse( - GURL(), 111, + GURL(), 0, 111, AppCacheEntry(AppCacheEntry::EXPLICIT, written_response_id_), false); EXPECT_TRUE(job->is_delivering_appcache_response()); @@ -702,7 +705,7 @@ class AppCacheURLRequestJobTest : public testing::Test { PushNextTask(NewRunnableMethod( this, &AppCacheURLRequestJobTest::RequestAppCachedResource, true)); - writer_.reset(service_->storage()->CreateResponseWriter(GURL())); + writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0)); written_response_id_ = writer_->response_id(); WriteLargeResponse(); @@ -730,7 +733,7 @@ class AppCacheURLRequestJobTest : public testing::Test { PushNextTask(NewRunnableMethod( this, &AppCacheURLRequestJobTest::RequestAppCachedResource, true)); - writer_.reset(service_->storage()->CreateResponseWriter(GURL())); + writer_.reset(service_->storage()->CreateResponseWriter(GURL(), 0)); written_response_id_ = writer_->response_id(); WriteLargeResponse(); |