diff options
| author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-15 23:32:46 +0000 |
|---|---|---|
| committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-15 23:32:46 +0000 |
| commit | 10f110fa152ec1f7d1c7797f2bb21b9387eb3188 (patch) | |
| tree | 096186743f44b6f9dc74501404a61a56779761e4 /content/browser/appcache | |
| parent | 7641fe33dae7bb8ef977232c6803b3faf8b2cbd4 (diff) | |
| download | chromium_src-10f110fa152ec1f7d1c7797f2bb21b9387eb3188.zip chromium_src-10f110fa152ec1f7d1c7797f2bb21b9387eb3188.tar.gz chromium_src-10f110fa152ec1f7d1c7797f2bb21b9387eb3188.tar.bz2 | |
Rename appcache constants in preparation for move to content namespace
BUG=338338
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/337713004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/appcache')
15 files changed, 491 insertions, 464 deletions
diff --git a/content/browser/appcache/appcache_database_unittest.cc b/content/browser/appcache/appcache_database_unittest.cc index 6e42296..92fa6a5 100644 --- a/content/browser/appcache/appcache_database_unittest.cc +++ b/content/browser/appcache/appcache_database_unittest.cc @@ -19,9 +19,9 @@ using appcache::AppCacheDatabase; using appcache::AppCacheEntry; -using appcache::FALLBACK_NAMESPACE; -using appcache::INTERCEPT_NAMESPACE; -using appcache::NETWORK_NAMESPACE; +using appcache::APPCACHE_FALLBACK_NAMESPACE; +using appcache::APPCACHE_INTERCEPT_NAMESPACE; +using appcache::APPCACHE_NETWORK_NAMESPACE; namespace { @@ -962,7 +962,7 @@ TEST(AppCacheDatabaseTest, UpgradeSchema3to5) { kMockOrigin.Resolve(base::StringPrintf(kTargetUrlFormat, i))); EXPECT_EQ(i, fallbacks[i].cache_id); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[i].namespace_.type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[i].namespace_.type); EXPECT_EQ(kMockOrigin, fallbacks[i].origin); EXPECT_EQ(expected_namespace_url, fallbacks[i].namespace_.namespace_url); EXPECT_EQ(expected_target_url, fallbacks[i].namespace_.target_url); @@ -1149,7 +1149,7 @@ TEST(AppCacheDatabaseTest, UpgradeSchema4to5) { kMockOrigin.Resolve(base::StringPrintf(kTargetUrlFormat, i))); statement.BindInt64(0, i); statement.BindString(1, kMockOrigin.spec().c_str()); - statement.BindInt(2, FALLBACK_NAMESPACE); + statement.BindInt(2, APPCACHE_FALLBACK_NAMESPACE); statement.BindString(3, namespace_url.spec().c_str()); statement.BindString(4, target_url.spec().c_str()); ASSERT_TRUE(statement.Run()); @@ -1202,7 +1202,7 @@ TEST(AppCacheDatabaseTest, UpgradeSchema4to5) { kMockOrigin.Resolve(base::StringPrintf(kWhitelistUrlFormat, i))); EXPECT_EQ(i, fallbacks[i].cache_id); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[i].namespace_.type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[i].namespace_.type); EXPECT_EQ(kMockOrigin, fallbacks[i].origin); EXPECT_EQ(expected_namespace_url, fallbacks[i].namespace_.namespace_url); EXPECT_EQ(expected_target_url, fallbacks[i].namespace_.target_url); diff --git a/content/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc index 077c7b8..64e46b1 100644 --- a/content/browser/appcache/appcache_dispatcher_host.cc +++ b/content/browser/appcache/appcache_dispatcher_host.cc @@ -162,7 +162,7 @@ void AppCacheDispatcherHost::OnGetStatus(int host_id, IPC::Message* reply_msg) { return; } - GetStatusCallback(appcache::UNCACHED, reply_msg); + GetStatusCallback(appcache::APPCACHE_STATUS_UNCACHED, reply_msg); } void AppCacheDispatcherHost::OnStartUpdate(int host_id, diff --git a/content/browser/appcache/appcache_frontend_proxy.cc b/content/browser/appcache/appcache_frontend_proxy.cc index 91df08d..ea693e9d 100644 --- a/content/browser/appcache/appcache_frontend_proxy.cc +++ b/content/browser/appcache/appcache_frontend_proxy.cc @@ -24,7 +24,8 @@ void AppCacheFrontendProxy::OnStatusChanged(const std::vector<int>& host_ids, void AppCacheFrontendProxy::OnEventRaised(const std::vector<int>& host_ids, appcache::AppCacheEventID event_id) { - DCHECK_NE(appcache::PROGRESS_EVENT, event_id); // See OnProgressEventRaised. + DCHECK_NE(appcache::APPCACHE_PROGRESS_EVENT, + event_id); // See OnProgressEventRaised. sender_->Send(new AppCacheMsg_EventRaised(host_ids, event_id)); } diff --git a/content/browser/appcache/appcache_group_unittest.cc b/content/browser/appcache/appcache_group_unittest.cc index 99e04f7..cec20fa 100644 --- a/content/browser/appcache/appcache_group_unittest.cc +++ b/content/browser/appcache/appcache_group_unittest.cc @@ -26,7 +26,7 @@ class TestAppCacheFrontend : public appcache::AppCacheFrontend { public: TestAppCacheFrontend() : last_host_id_(-1), last_cache_id_(-1), - last_status_(appcache::OBSOLETE) { + last_status_(appcache::APPCACHE_STATUS_OBSOLETE) { } virtual void OnCacheSelected( @@ -197,12 +197,12 @@ TEST_F(AppCacheGroupTest, CleanupUnusedGroup) { host1.AssociateCompleteCache(cache1); EXPECT_EQ(frontend.last_host_id_, host1.host_id()); EXPECT_EQ(frontend.last_cache_id_, cache1->cache_id()); - EXPECT_EQ(frontend.last_status_, appcache::IDLE); + EXPECT_EQ(frontend.last_status_, appcache::APPCACHE_STATUS_IDLE); host2.AssociateCompleteCache(cache1); EXPECT_EQ(frontend.last_host_id_, host2.host_id()); EXPECT_EQ(frontend.last_cache_id_, cache1->cache_id()); - EXPECT_EQ(frontend.last_status_, appcache::IDLE); + EXPECT_EQ(frontend.last_status_, appcache::APPCACHE_STATUS_IDLE); AppCache* cache2 = new AppCache(service.storage(), 222); cache2->set_complete(true); @@ -214,8 +214,8 @@ TEST_F(AppCacheGroupTest, CleanupUnusedGroup) { host1.AssociateNoCache(GURL()); host2.AssociateNoCache(GURL()); EXPECT_EQ(frontend.last_host_id_, host2.host_id()); - EXPECT_EQ(frontend.last_cache_id_, appcache::kNoCacheId); - EXPECT_EQ(frontend.last_status_, appcache::UNCACHED); + EXPECT_EQ(frontend.last_cache_id_, appcache::kAppCacheNoCacheId); + EXPECT_EQ(frontend.last_status_, appcache::APPCACHE_STATUS_UNCACHED); } TEST_F(AppCacheGroupTest, StartUpdate) { @@ -233,7 +233,7 @@ TEST_F(AppCacheGroupTest, StartUpdate) { group->StartUpdateWithHost(NULL); EXPECT_EQ(update, group->update_job_); - // Deleting the update should restore the group to IDLE. + // Deleting the update should restore the group to APPCACHE_STATUS_IDLE. delete update; EXPECT_TRUE(group->update_job_ == NULL); EXPECT_EQ(AppCacheGroup::IDLE, group->update_status()); diff --git a/content/browser/appcache/appcache_host_unittest.cc b/content/browser/appcache/appcache_host_unittest.cc index db640d5..6b9970d 100644 --- a/content/browser/appcache/appcache_host_unittest.cc +++ b/content/browser/appcache/appcache_host_unittest.cc @@ -22,13 +22,13 @@ using appcache::AppCacheEntry; using appcache::AppCacheFrontend; using appcache::AppCacheGroup; using appcache::AppCacheHost; -using appcache::kNoCacheId; -using appcache::ERROR_EVENT; -using appcache::OBSOLETE; -using appcache::OBSOLETE_EVENT; -using appcache::PROGRESS_EVENT; +using appcache::kAppCacheNoCacheId; +using appcache::APPCACHE_ERROR_EVENT; +using appcache::APPCACHE_STATUS_OBSOLETE; +using appcache::APPCACHE_OBSOLETE_EVENT; +using appcache::APPCACHE_PROGRESS_EVENT; using appcache::AppCacheStatus; -using appcache::UNCACHED; +using appcache::APPCACHE_STATUS_UNCACHED; namespace content { @@ -50,9 +50,9 @@ class AppCacheHostTest : public testing::Test { public: MockFrontend() : last_host_id_(-222), last_cache_id_(-222), - last_status_(appcache::OBSOLETE), - last_status_changed_(appcache::OBSOLETE), - last_event_id_(appcache::OBSOLETE_EVENT), + last_status_(appcache::APPCACHE_STATUS_OBSOLETE), + last_status_changed_(appcache::APPCACHE_STATUS_OBSOLETE), + last_event_id_(appcache::APPCACHE_OBSOLETE_EVENT), content_blocked_(false) { } @@ -76,14 +76,14 @@ class AppCacheHostTest : public testing::Test { virtual void OnErrorEventRaised( const std::vector<int>& host_ids, const appcache::AppCacheErrorDetails& details) OVERRIDE { - last_event_id_ = ERROR_EVENT; + last_event_id_ = APPCACHE_ERROR_EVENT; } virtual void OnProgressEventRaised(const std::vector<int>& host_ids, const GURL& url, int num_total, int num_complete) OVERRIDE { - last_event_id_ = PROGRESS_EVENT; + last_event_id_ = APPCACHE_PROGRESS_EVENT; } virtual void OnLogMessage(int host_id, @@ -193,9 +193,9 @@ TEST_F(AppCacheHostTest, Basic) { // See that the callbacks are delivered immediately // and respond as if there is no cache selected. - last_status_result_ = OBSOLETE; + last_status_result_ = APPCACHE_STATUS_OBSOLETE; host.GetStatusWithCallback(get_status_callback_, reinterpret_cast<void*>(1)); - EXPECT_EQ(UNCACHED, last_status_result_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, last_status_result_); EXPECT_EQ(reinterpret_cast<void*>(1), last_callback_param_); last_start_result_ = true; @@ -218,18 +218,18 @@ TEST_F(AppCacheHostTest, SelectNoCache) { // Reset our mock frontend mock_frontend_.last_cache_id_ = -333; mock_frontend_.last_host_id_ = -333; - mock_frontend_.last_status_ = OBSOLETE; + mock_frontend_.last_status_ = APPCACHE_STATUS_OBSOLETE; const GURL kDocAndOriginUrl(GURL("http://whatever/").GetOrigin()); { AppCacheHost host(1, &mock_frontend_, &service_); - host.SelectCache(kDocAndOriginUrl, kNoCacheId, GURL()); + host.SelectCache(kDocAndOriginUrl, kAppCacheNoCacheId, GURL()); EXPECT_EQ(1, mock_quota_proxy->GetInUseCount(kDocAndOriginUrl)); // We should have received an OnCacheSelected msg EXPECT_EQ(1, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // Otherwise, see that it respond as if there is no cache selected. EXPECT_EQ(1, host.host_id()); @@ -247,7 +247,7 @@ TEST_F(AppCacheHostTest, ForeignEntry) { // Reset our mock frontend mock_frontend_.last_cache_id_ = -333; mock_frontend_.last_host_id_ = -333; - mock_frontend_.last_status_ = OBSOLETE; + mock_frontend_.last_status_ = APPCACHE_STATUS_OBSOLETE; // Precondition, a cache with an entry that is not marked as foreign. const int kCacheId = 22; @@ -258,10 +258,10 @@ TEST_F(AppCacheHostTest, ForeignEntry) { AppCacheHost host(1, &mock_frontend_, &service_); host.MarkAsForeignEntry(kDocumentURL, kCacheId); - // We should have received an OnCacheSelected msg for kNoCacheId. + // We should have received an OnCacheSelected msg for kAppCacheNoCacheId. EXPECT_EQ(1, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // See that it respond as if there is no cache selected. EXPECT_EQ(1, host.host_id()); @@ -278,7 +278,7 @@ TEST_F(AppCacheHostTest, ForeignFallbackEntry) { // Reset our mock frontend mock_frontend_.last_cache_id_ = -333; mock_frontend_.last_host_id_ = -333; - mock_frontend_.last_status_ = OBSOLETE; + mock_frontend_.last_status_ = APPCACHE_STATUS_OBSOLETE; // Precondition, a cache with a fallback entry that is not marked as foreign. const int kCacheId = 22; @@ -290,10 +290,10 @@ TEST_F(AppCacheHostTest, ForeignFallbackEntry) { host.NotifyMainResourceIsNamespaceEntry(kFallbackURL); host.MarkAsForeignEntry(GURL("http://origin/missing_document"), kCacheId); - // We should have received an OnCacheSelected msg for kNoCacheId. + // We should have received an OnCacheSelected msg for kAppCacheNoCacheId. EXPECT_EQ(1, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // See that the fallback entry was marked as foreign. EXPECT_TRUE(cache->GetEntry(kFallbackURL)->IsForeign()); @@ -303,7 +303,7 @@ TEST_F(AppCacheHostTest, FailedCacheLoad) { // Reset our mock frontend mock_frontend_.last_cache_id_ = -333; mock_frontend_.last_host_id_ = -333; - mock_frontend_.last_status_ = OBSOLETE; + mock_frontend_.last_status_ = APPCACHE_STATUS_OBSOLETE; AppCacheHost host(1, &mock_frontend_, &service_); EXPECT_FALSE(host.is_selection_pending()); @@ -316,10 +316,10 @@ TEST_F(AppCacheHostTest, FailedCacheLoad) { EXPECT_TRUE(host.is_selection_pending()); // The callback should not occur until we finish cache selection. - last_status_result_ = OBSOLETE; + last_status_result_ = APPCACHE_STATUS_OBSOLETE; last_callback_param_ = reinterpret_cast<void*>(-1); host.GetStatusWithCallback(get_status_callback_, reinterpret_cast<void*>(1)); - EXPECT_EQ(OBSOLETE, last_status_result_); + EXPECT_EQ(APPCACHE_STATUS_OBSOLETE, last_status_result_); EXPECT_EQ(reinterpret_cast<void*>(-1), last_callback_param_); // Satisfy the load with NULL, a failure. @@ -328,11 +328,11 @@ TEST_F(AppCacheHostTest, FailedCacheLoad) { // Cache selection should have finished EXPECT_FALSE(host.is_selection_pending()); EXPECT_EQ(1, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // Callback should have fired upon completing the cache load too. - EXPECT_EQ(UNCACHED, last_status_result_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, last_status_result_); EXPECT_EQ(reinterpret_cast<void*>(1), last_callback_param_); } @@ -347,10 +347,10 @@ TEST_F(AppCacheHostTest, FailedGroupLoad) { EXPECT_TRUE(host.is_selection_pending()); // The callback should not occur until we finish cache selection. - last_status_result_ = OBSOLETE; + last_status_result_ = APPCACHE_STATUS_OBSOLETE; last_callback_param_ = reinterpret_cast<void*>(-1); host.GetStatusWithCallback(get_status_callback_, reinterpret_cast<void*>(1)); - EXPECT_EQ(OBSOLETE, last_status_result_); + EXPECT_EQ(APPCACHE_STATUS_OBSOLETE, last_status_result_); EXPECT_EQ(reinterpret_cast<void*>(-1), last_callback_param_); // Satisfy the load will NULL, a failure. @@ -359,11 +359,11 @@ TEST_F(AppCacheHostTest, FailedGroupLoad) { // Cache selection should have finished EXPECT_FALSE(host.is_selection_pending()); EXPECT_EQ(1, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // Callback should have fired upon completing the group load. - EXPECT_EQ(UNCACHED, last_status_result_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, last_status_result_); EXPECT_EQ(reinterpret_cast<void*>(1), last_callback_param_); } @@ -387,11 +387,11 @@ TEST_F(AppCacheHostTest, SetSwappableCache) { host.AssociateCompleteCache(cache1); EXPECT_FALSE(host.swappable_cache_.get()); // was same as associated cache - EXPECT_EQ(appcache::IDLE, host.GetStatus()); + EXPECT_EQ(appcache::APPCACHE_STATUS_IDLE, host.GetStatus()); // verify OnCacheSelected was called EXPECT_EQ(host.host_id(), mock_frontend_.last_host_id_); EXPECT_EQ(cache1->cache_id(), mock_frontend_.last_cache_id_); - EXPECT_EQ(appcache::IDLE, mock_frontend_.last_status_); + EXPECT_EQ(appcache::APPCACHE_STATUS_IDLE, mock_frontend_.last_status_); AppCache* cache2 = new AppCache(service_.storage(), 222); cache2->set_complete(true); @@ -459,8 +459,8 @@ TEST_F(AppCacheHostTest, ForDedicatedWorker) { // the scriptable interface, the only function available is resource // loading (see appcache_request_handler_unittests those tests). EXPECT_EQ(kWorkerHostId, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // Simulate the parent being torn down. backend_impl.UnregisterHost(kParentHostId); @@ -480,8 +480,8 @@ TEST_F(AppCacheHostTest, SelectCacheAllowed) { // Reset our mock frontend mock_frontend_.last_cache_id_ = -333; mock_frontend_.last_host_id_ = -333; - mock_frontend_.last_status_ = OBSOLETE; - mock_frontend_.last_event_id_ = OBSOLETE_EVENT; + mock_frontend_.last_status_ = APPCACHE_STATUS_OBSOLETE; + mock_frontend_.last_event_id_ = APPCACHE_OBSOLETE_EVENT; mock_frontend_.content_blocked_ = false; const GURL kDocAndOriginUrl(GURL("http://whatever/").GetOrigin()); @@ -489,16 +489,16 @@ TEST_F(AppCacheHostTest, SelectCacheAllowed) { { AppCacheHost host(1, &mock_frontend_, &service_); host.first_party_url_ = kDocAndOriginUrl; - host.SelectCache(kDocAndOriginUrl, kNoCacheId, kManifestUrl); + host.SelectCache(kDocAndOriginUrl, kAppCacheNoCacheId, kManifestUrl); EXPECT_EQ(1, mock_quota_proxy->GetInUseCount(kDocAndOriginUrl)); // MockAppCacheService::LoadOrCreateGroup is asynchronous, so we shouldn't // have received an OnCacheSelected msg yet. EXPECT_EQ(-333, mock_frontend_.last_host_id_); EXPECT_EQ(-333, mock_frontend_.last_cache_id_); - EXPECT_EQ(OBSOLETE, mock_frontend_.last_status_); + EXPECT_EQ(APPCACHE_STATUS_OBSOLETE, mock_frontend_.last_status_); // No error events either - EXPECT_EQ(OBSOLETE_EVENT, mock_frontend_.last_event_id_); + EXPECT_EQ(APPCACHE_OBSOLETE_EVENT, mock_frontend_.last_event_id_); EXPECT_FALSE(mock_frontend_.content_blocked_); EXPECT_TRUE(host.is_selection_pending()); @@ -518,8 +518,8 @@ TEST_F(AppCacheHostTest, SelectCacheBlocked) { // Reset our mock frontend mock_frontend_.last_cache_id_ = -333; mock_frontend_.last_host_id_ = -333; - mock_frontend_.last_status_ = OBSOLETE; - mock_frontend_.last_event_id_ = OBSOLETE_EVENT; + mock_frontend_.last_status_ = APPCACHE_STATUS_OBSOLETE; + mock_frontend_.last_event_id_ = APPCACHE_OBSOLETE_EVENT; mock_frontend_.content_blocked_ = false; const GURL kDocAndOriginUrl(GURL("http://whatever/").GetOrigin()); @@ -527,16 +527,16 @@ TEST_F(AppCacheHostTest, SelectCacheBlocked) { { AppCacheHost host(1, &mock_frontend_, &service_); host.first_party_url_ = kDocAndOriginUrl; - host.SelectCache(kDocAndOriginUrl, kNoCacheId, kManifestUrl); + host.SelectCache(kDocAndOriginUrl, kAppCacheNoCacheId, kManifestUrl); EXPECT_EQ(1, mock_quota_proxy->GetInUseCount(kDocAndOriginUrl)); // We should have received an OnCacheSelected msg EXPECT_EQ(1, mock_frontend_.last_host_id_); - EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_); - EXPECT_EQ(UNCACHED, mock_frontend_.last_status_); + EXPECT_EQ(kAppCacheNoCacheId, mock_frontend_.last_cache_id_); + EXPECT_EQ(APPCACHE_STATUS_UNCACHED, mock_frontend_.last_status_); // Also, an error event was raised - EXPECT_EQ(ERROR_EVENT, mock_frontend_.last_event_id_); + EXPECT_EQ(APPCACHE_ERROR_EVENT, mock_frontend_.last_event_id_); EXPECT_TRUE(mock_frontend_.content_blocked_); // Otherwise, see that it respond as if there is no cache selected. diff --git a/content/browser/appcache/appcache_interceptor.cc b/content/browser/appcache/appcache_interceptor.cc index 069d2fd..ac7dbc3 100644 --- a/content/browser/appcache/appcache_interceptor.cc +++ b/content/browser/appcache/appcache_interceptor.cc @@ -15,8 +15,8 @@ using appcache::AppCacheBackendImpl; using appcache::AppCacheHost; using appcache::AppCacheRequestHandler; using appcache::AppCacheServiceImpl; -using appcache::kNoCacheId; -using appcache::kNoHostId; +using appcache::kAppCacheNoCacheId; +using appcache::kAppCacheNoHostId; namespace content { @@ -39,7 +39,7 @@ AppCacheRequestHandler* AppCacheInterceptor::GetHandler( void AppCacheInterceptor::SetExtraRequestInfo( net::URLRequest* request, AppCacheServiceImpl* service, int process_id, int host_id, ResourceType::Type resource_type) { - if (!service || (host_id == kNoHostId)) + if (!service || (host_id == kAppCacheNoHostId)) return; AppCacheBackendImpl* backend = service->GetBackend(process_id); @@ -62,7 +62,7 @@ void AppCacheInterceptor::SetExtraRequestInfo( void AppCacheInterceptor::GetExtraResponseInfo(net::URLRequest* request, int64* cache_id, GURL* manifest_url) { - DCHECK(*cache_id == kNoCacheId); + DCHECK(*cache_id == kAppCacheNoCacheId); DCHECK(manifest_url->is_empty()); AppCacheRequestHandler* handler = GetHandler(request); if (handler) @@ -85,7 +85,7 @@ void AppCacheInterceptor::CompleteCrossSiteTransfer( AppCacheRequestHandler* handler = GetHandler(request); if (!handler) return; - DCHECK_NE(kNoHostId, new_host_id); + DCHECK_NE(kAppCacheNoHostId, new_host_id); handler->CompleteCrossSiteTransfer(new_process_id, new_host_id); } diff --git a/content/browser/appcache/appcache_request_handler_unittest.cc b/content/browser/appcache/appcache_request_handler_unittest.cc index ded619d..df6fb33 100644 --- a/content/browser/appcache/appcache_request_handler_unittest.cc +++ b/content/browser/appcache/appcache_request_handler_unittest.cc @@ -36,7 +36,7 @@ using appcache::AppCacheHost; using appcache::AppCacheInfo; using appcache::AppCacheRequestHandler; using appcache::AppCacheURLRequestJob; -using appcache::kNoCacheId; +using appcache::kAppCacheNoCacheId; namespace content { @@ -292,10 +292,10 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_FALSE(job_->is_waiting()); EXPECT_TRUE(job_->is_delivering_network_response()); - int64 cache_id = kNoCacheId; + int64 cache_id = kAppCacheNoCacheId; GURL manifest_url; handler_->GetExtraResponseInfo(&cache_id, &manifest_url); - EXPECT_EQ(kNoCacheId, cache_id); + EXPECT_EQ(kAppCacheNoCacheId, cache_id); EXPECT_EQ(GURL(), manifest_url); EXPECT_EQ(0, handler_->found_group_id_); @@ -344,7 +344,7 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_FALSE(job_->is_waiting()); EXPECT_TRUE(job_->is_delivering_appcache_response()); - int64 cache_id = kNoCacheId; + int64 cache_id = kAppCacheNoCacheId; GURL manifest_url; handler_->GetExtraResponseInfo(&cache_id, &manifest_url); EXPECT_EQ(1, cache_id); @@ -429,7 +429,7 @@ class AppCacheRequestHandlerTest : public testing::Test { EXPECT_TRUE(job_.get()); EXPECT_TRUE(job_->is_delivering_appcache_response()); - int64 cache_id = kNoCacheId; + int64 cache_id = kAppCacheNoCacheId; GURL manifest_url; handler_->GetExtraResponseInfo(&cache_id, &manifest_url); EXPECT_EQ(1, cache_id); diff --git a/content/browser/appcache/appcache_storage_impl_unittest.cc b/content/browser/appcache/appcache_storage_impl_unittest.cc index e7b40b3..4c467a1 100644 --- a/content/browser/appcache/appcache_storage_impl_unittest.cc +++ b/content/browser/appcache/appcache_storage_impl_unittest.cc @@ -34,8 +34,8 @@ #include "webkit/browser/appcache/appcache_storage_impl.h" #include "webkit/browser/quota/quota_manager.h" -using appcache::FALLBACK_NAMESPACE; -using appcache::NETWORK_NAMESPACE; +using appcache::APPCACHE_FALLBACK_NAMESPACE; +using appcache::APPCACHE_NETWORK_NAMESPACE; using appcache::AppCacheBackendImpl; using appcache::AppCacheDatabase; using appcache::AppCacheEntry; @@ -50,9 +50,9 @@ using appcache::AppCacheStorageReference; using appcache::AppCache; using appcache::AppCacheErrorDetails; using appcache::AppCacheEventID; -using appcache::kNoCacheId; -using appcache::kNoResponseId; -using appcache::INTERCEPT_NAMESPACE; +using appcache::kAppCacheNoCacheId; +using appcache::kAppCacheNoResponseId; +using appcache::APPCACHE_INTERCEPT_NAMESPACE; using appcache::AppCacheLogLevel; using appcache::Namespace; using appcache::AppCacheStatus; @@ -202,7 +202,7 @@ class AppCacheStorageImplTest : public testing::Test { explicit MockStorageDelegate(AppCacheStorageImplTest* test) : loaded_cache_id_(0), stored_group_success_(false), would_exceed_quota_(false), obsoleted_success_(false), - found_cache_id_(kNoCacheId), test_(test) { + found_cache_id_(kAppCacheNoCacheId), test_(test) { } virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) OVERRIDE { @@ -973,9 +973,10 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindNoMainResponse() { EXPECT_EQ(kEntryUrl, delegate()->found_url_); EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); - EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoCacheId, delegate()->found_cache_id_); + EXPECT_EQ(kAppCacheNoResponseId, delegate()->found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate()->found_fallback_entry_.response_id()); EXPECT_TRUE(delegate()->found_namespace_entry_url_.is_empty()); EXPECT_EQ(0, delegate()->found_entry_.types()); EXPECT_EQ(0, delegate()->found_fallback_entry_.types()); @@ -1053,9 +1054,15 @@ class AppCacheStorageImplTest : public testing::Test { cache_->AddEntry(kEntryUrl, AppCacheEntry(AppCacheEntry::FALLBACK, 1)); cache_->AddEntry(kEntryUrl2, AppCacheEntry(AppCacheEntry::FALLBACK, 2)); cache_->fallback_namespaces_.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespace2, kEntryUrl2, false)); + Namespace(APPCACHE_FALLBACK_NAMESPACE, + kFallbackNamespace2, + kEntryUrl2, + false)); cache_->fallback_namespaces_.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespace, kEntryUrl, false)); + Namespace(APPCACHE_FALLBACK_NAMESPACE, + kFallbackNamespace, + kEntryUrl, + false)); AppCacheDatabase::CacheRecord cache_record; std::vector<AppCacheDatabase::EntryRecord> entries; std::vector<AppCacheDatabase::NamespaceRecord> intercepts; @@ -1125,10 +1132,10 @@ class AppCacheStorageImplTest : public testing::Test { cache_->AddEntry(kEntryUrl, AppCacheEntry(AppCacheEntry::INTERCEPT, 1)); cache_->AddEntry(kEntryUrl2, AppCacheEntry(AppCacheEntry::INTERCEPT, 2)); cache_->intercept_namespaces_.push_back( - Namespace(INTERCEPT_NAMESPACE, kInterceptNamespace2, + Namespace(APPCACHE_INTERCEPT_NAMESPACE, kInterceptNamespace2, kEntryUrl2, false)); cache_->intercept_namespaces_.push_back( - Namespace(INTERCEPT_NAMESPACE, kInterceptNamespace, + Namespace(APPCACHE_INTERCEPT_NAMESPACE, kInterceptNamespace, kEntryUrl, false)); AppCacheDatabase::CacheRecord cache_record; std::vector<AppCacheDatabase::EntryRecord> entries; @@ -1195,7 +1202,7 @@ class AppCacheStorageImplTest : public testing::Test { MakeCacheAndGroup(kManifestUrl, 2, 1, true); cache_->AddEntry(kEntryUrl, AppCacheEntry(AppCacheEntry::INTERCEPT, 1)); cache_->intercept_namespaces_.push_back( - Namespace(INTERCEPT_NAMESPACE, kInterceptPatternNamespace, + Namespace(APPCACHE_INTERCEPT_NAMESPACE, kInterceptPatternNamespace, kEntryUrl, true)); AppCacheDatabase::CacheRecord cache_record; std::vector<AppCacheDatabase::EntryRecord> entries; @@ -1238,9 +1245,10 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindInterceptPatternMatchNegative() { EXPECT_EQ(kInterceptPatternTestNegativeUrl, delegate()->found_url_); EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); - EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoCacheId, delegate()->found_cache_id_); + EXPECT_EQ(kAppCacheNoResponseId, delegate()->found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate()->found_fallback_entry_.response_id()); EXPECT_TRUE(delegate()->found_namespace_entry_url_.is_empty()); EXPECT_EQ(0, delegate()->found_entry_.types()); EXPECT_EQ(0, delegate()->found_fallback_entry_.types()); @@ -1281,7 +1289,7 @@ class AppCacheStorageImplTest : public testing::Test { MakeCacheAndGroup(kManifestUrl, 2, 1, true); cache_->AddEntry(kEntryUrl, AppCacheEntry(AppCacheEntry::FALLBACK, 1)); cache_->fallback_namespaces_.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackPatternNamespace, + Namespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackPatternNamespace, kEntryUrl, true)); AppCacheDatabase::CacheRecord cache_record; std::vector<AppCacheDatabase::EntryRecord> entries; @@ -1324,9 +1332,10 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindFallbackPatternMatchNegative() { EXPECT_EQ(kFallbackPatternTestNegativeUrl, delegate()->found_url_); EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); - EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoCacheId, delegate()->found_cache_id_); + EXPECT_EQ(kAppCacheNoResponseId, delegate()->found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate()->found_fallback_entry_.response_id()); EXPECT_TRUE(delegate()->found_namespace_entry_url_.is_empty()); EXPECT_EQ(0, delegate()->found_entry_.types()); EXPECT_EQ(0, delegate()->found_fallback_entry_.types()); @@ -1411,7 +1420,10 @@ class AppCacheStorageImplTest : public testing::Test { fallback_namespace_record.origin = manifest_url.GetOrigin(); EXPECT_TRUE(database()->InsertNamespace(&fallback_namespace_record)); cache_->fallback_namespaces_.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespace, kEntryUrl2, false)); + Namespace(APPCACHE_FALLBACK_NAMESPACE, + kFallbackNamespace, + kEntryUrl2, + false)); } void Verify_FindMainResponseWithMultipleHits() { @@ -1523,12 +1535,15 @@ class AppCacheStorageImplTest : public testing::Test { AppCacheEntry(AppCacheEntry::EXPLICIT | AppCacheEntry::FOREIGN, 1)); cache_->AddEntry(kEntryUrl2, AppCacheEntry(AppCacheEntry::FALLBACK, 2)); cache_->fallback_namespaces_.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespace, kEntryUrl2, false)); + Namespace(APPCACHE_FALLBACK_NAMESPACE, + kFallbackNamespace, + kEntryUrl2, + false)); cache_->online_whitelist_namespaces_.push_back( - Namespace(NETWORK_NAMESPACE, kOnlineNamespace, + Namespace(APPCACHE_NETWORK_NAMESPACE, kOnlineNamespace, GURL(), false)); cache_->online_whitelist_namespaces_.push_back( - Namespace(NETWORK_NAMESPACE, kOnlineNamespaceWithinFallback, + Namespace(APPCACHE_NETWORK_NAMESPACE, kOnlineNamespaceWithinFallback, GURL(), false)); AppCacheDatabase::EntryRecord entry_record; @@ -1564,10 +1579,11 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_ExclusionNotFound(GURL expected_url, int phase) { EXPECT_EQ(expected_url, delegate()->found_url_); EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); + EXPECT_EQ(kAppCacheNoCacheId, delegate()->found_cache_id_); EXPECT_EQ(0, delegate()->found_group_id_); - EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, delegate()->found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate()->found_fallback_entry_.response_id()); EXPECT_TRUE(delegate()->found_namespace_entry_url_.is_empty()); EXPECT_EQ(0, delegate()->found_entry_.types()); EXPECT_EQ(0, delegate()->found_fallback_entry_.types()); @@ -1760,7 +1776,7 @@ class AppCacheStorageImplTest : public testing::Test { const GURL kEmptyPageUrl(MockHttpServer::GetMockUrl("empty.html")); host1->first_party_url_ = kEmptyPageUrl; host1->SelectCache(kEmptyPageUrl, - kNoCacheId, + kAppCacheNoCacheId, MockHttpServer::GetMockUrl("manifest")); } else { ASSERT_EQ(CORRUPT_CACHE_ON_LOAD_EXISTING, test_case); diff --git a/content/browser/appcache/appcache_unittest.cc b/content/browser/appcache/appcache_unittest.cc index 8225569..32c4e89 100644 --- a/content/browser/appcache/appcache_unittest.cc +++ b/content/browser/appcache/appcache_unittest.cc @@ -16,13 +16,13 @@ using appcache::AppCacheHost; using appcache::AppCacheInfo; using appcache::AppCacheErrorDetails; using appcache::AppCacheEventID; -using appcache::FALLBACK_NAMESPACE; -using appcache::INTERCEPT_NAMESPACE; +using appcache::APPCACHE_FALLBACK_NAMESPACE; +using appcache::APPCACHE_INTERCEPT_NAMESPACE; using appcache::AppCacheLogLevel; using appcache::Manifest; using appcache::Namespace; using appcache::NamespaceVector; -using appcache::NETWORK_NAMESPACE; +using appcache::APPCACHE_NETWORK_NAMESPACE; using appcache::PARSE_MANIFEST_ALLOWING_INTERCEPTS; using appcache::PARSE_MANIFEST_PER_STANDARD; using appcache::AppCacheStatus; @@ -132,12 +132,12 @@ TEST(AppCacheTest, InitializeWithManifest) { manifest.explicit_urls.insert("http://one.com"); manifest.explicit_urls.insert("http://two.com"); manifest.fallback_namespaces.push_back( - Namespace(FALLBACK_NAMESPACE, GURL("http://fb1.com"), + Namespace(APPCACHE_FALLBACK_NAMESPACE, GURL("http://fb1.com"), GURL("http://fbone.com"), true)); manifest.online_whitelist_namespaces.push_back( - Namespace(NETWORK_NAMESPACE, GURL("http://w1.com"), GURL(), false)); + Namespace(APPCACHE_NETWORK_NAMESPACE, GURL("http://w1.com"), GURL(), false)); manifest.online_whitelist_namespaces.push_back( - Namespace(NETWORK_NAMESPACE, GURL("http://w2.com"), GURL(), false)); + Namespace(APPCACHE_NETWORK_NAMESPACE, GURL("http://w2.com"), GURL(), false)); manifest.online_whitelist_all = true; cache->InitializeWithManifest(&manifest); @@ -193,22 +193,23 @@ TEST(AppCacheTest, FindResponseForRequest) { Manifest manifest; manifest.online_whitelist_namespaces.push_back( - Namespace(NETWORK_NAMESPACE, kOnlineNamespaceUrl, + Namespace(APPCACHE_NETWORK_NAMESPACE, kOnlineNamespaceUrl, GURL(), false)); manifest.online_whitelist_namespaces.push_back( - Namespace(NETWORK_NAMESPACE, kOnlineNamespaceWithinOtherNamespaces, + Namespace(APPCACHE_NETWORK_NAMESPACE, + kOnlineNamespaceWithinOtherNamespaces, GURL(), false)); manifest.fallback_namespaces.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespaceUrl1, + Namespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackNamespaceUrl1, kFallbackEntryUrl1, false)); manifest.fallback_namespaces.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespaceUrl2, + Namespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackNamespaceUrl2, kFallbackEntryUrl2, false)); manifest.intercept_namespaces.push_back( - Namespace(INTERCEPT_NAMESPACE, kInterceptNamespace, + Namespace(APPCACHE_INTERCEPT_NAMESPACE, kInterceptNamespace, kInterceptNamespaceEntry, false)); manifest.intercept_namespaces.push_back( - Namespace(INTERCEPT_NAMESPACE, kInterceptNamespaceWithinFallback, + Namespace(APPCACHE_INTERCEPT_NAMESPACE, kInterceptNamespaceWithinFallback, kInterceptNamespaceEntry, false)); // Create a cache with some namespaces and entries. @@ -384,7 +385,7 @@ TEST(AppCacheTest, FindInterceptPatternResponseForRequest) { const int64 kInterceptResponseId = 1; Manifest manifest; manifest.intercept_namespaces.push_back( - Namespace(INTERCEPT_NAMESPACE, kInterceptPatternNamespace, + Namespace(APPCACHE_INTERCEPT_NAMESPACE, kInterceptPatternNamespace, kInterceptNamespaceEntry, true)); scoped_refptr<AppCache> cache(new AppCache(service.storage(), 1234)); cache->InitializeWithManifest(&manifest); @@ -455,7 +456,7 @@ TEST(AppCacheTest, FindFallbackPatternResponseForRequest) { const int64 kFallbackResponseId = 1; Manifest manifest; manifest.fallback_namespaces.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackPatternNamespace, + Namespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackPatternNamespace, kFallbackNamespaceEntry, true)); scoped_refptr<AppCache> cache(new AppCache(service.storage(), 1234)); cache->InitializeWithManifest(&manifest); @@ -525,7 +526,7 @@ TEST(AppCacheTest, FindNetworkNamespacePatternResponseForRequest) { kNetworkNamespaceBase.Resolve("*.hit*")); Manifest manifest; manifest.online_whitelist_namespaces.push_back( - Namespace(NETWORK_NAMESPACE, kNetworkPatternNamespace, + Namespace(APPCACHE_NETWORK_NAMESPACE, kNetworkPatternNamespace, GURL(), true)); manifest.online_whitelist_all = false; scoped_refptr<AppCache> cache(new AppCache(service.storage(), 1234)); @@ -583,7 +584,8 @@ TEST(AppCacheTest, ToFromDatabaseRecords) { EXPECT_TRUE(ParseManifest(kManifestUrl, kData.c_str(), kData.length(), PARSE_MANIFEST_ALLOWING_INTERCEPTS, manifest)); cache->InitializeWithManifest(&manifest); - EXPECT_EQ(NETWORK_NAMESPACE, cache->online_whitelist_namespaces_[0].type); + EXPECT_EQ(APPCACHE_NETWORK_NAMESPACE, + cache->online_whitelist_namespaces_[0].type); EXPECT_TRUE(cache->online_whitelist_namespaces_[0].is_pattern); EXPECT_EQ(kWhitelistUrl, cache->online_whitelist_namespaces_[0].namespace_url); @@ -634,7 +636,8 @@ TEST(AppCacheTest, ToFromDatabaseRecords) { EXPECT_EQ(kFallbackUrl, cache->GetFallbackEntryUrl(GURL("http://foo.com/"))); EXPECT_EQ(1 + 2 + 3, cache->cache_size()); - EXPECT_EQ(NETWORK_NAMESPACE, cache->online_whitelist_namespaces_[0].type); + EXPECT_EQ(APPCACHE_NETWORK_NAMESPACE, + cache->online_whitelist_namespaces_[0].type); EXPECT_TRUE(cache->online_whitelist_namespaces_[0].is_pattern); EXPECT_EQ(kWhitelistUrl, cache->online_whitelist_namespaces_[0].namespace_url); diff --git a/content/browser/appcache/appcache_update_job_unittest.cc b/content/browser/appcache/appcache_update_job_unittest.cc index 8b69991..bc3957e 100644 --- a/content/browser/appcache/appcache_update_job_unittest.cc +++ b/content/browser/appcache/appcache_update_job_unittest.cc @@ -28,21 +28,21 @@ using appcache::AppCacheGroup; using appcache::AppCacheResponseInfo; using appcache::AppCacheUpdateJob; using appcache::AppCacheResponseWriter; -using appcache::CACHED_EVENT; -using appcache::CHECKING_EVENT; -using appcache::DOWNLOADING_EVENT; -using appcache::ERROR_EVENT; +using appcache::APPCACHE_CACHED_EVENT; +using appcache::APPCACHE_CHECKING_EVENT; +using appcache::APPCACHE_DOWNLOADING_EVENT; +using appcache::APPCACHE_ERROR_EVENT; using appcache::AppCacheEventID; -using appcache::FALLBACK_NAMESPACE; +using appcache::APPCACHE_FALLBACK_NAMESPACE; using appcache::HttpResponseInfoIOBuffer; -using appcache::kNoCacheId; -using appcache::kNoResponseId; +using appcache::kAppCacheNoCacheId; +using appcache::kAppCacheNoResponseId; using appcache::Namespace; -using appcache::NETWORK_NAMESPACE; -using appcache::NO_UPDATE_EVENT; -using appcache::OBSOLETE_EVENT; -using appcache::PROGRESS_EVENT; -using appcache::UPDATE_READY_EVENT; +using appcache::APPCACHE_NETWORK_NAMESPACE; +using appcache::APPCACHE_NO_UPDATE_EVENT; +using appcache::APPCACHE_OBSOLETE_EVENT; +using appcache::APPCACHE_PROGRESS_EVENT; +using appcache::APPCACHE_UPDATE_READY_EVENT; using appcache::AppCacheStatus; namespace content { @@ -240,7 +240,7 @@ class MockFrontend : public AppCacheFrontend { MockFrontend() : ignore_progress_events_(false), verify_progress_events_(false), last_progress_total_(-1), last_progress_complete_(-1), - start_update_trigger_(CHECKING_EVENT), update_(NULL) { + start_update_trigger_(APPCACHE_CHECKING_EVENT), update_(NULL) { } virtual void OnCacheSelected( @@ -271,7 +271,7 @@ class MockFrontend : public AppCacheFrontend { const appcache::AppCacheErrorDetails& details) OVERRIDE { error_message_ = details.message; - OnEventRaised(host_ids, ERROR_EVENT); + OnEventRaised(host_ids, APPCACHE_ERROR_EVENT); } virtual void OnProgressEventRaised(const std::vector<int>& host_ids, @@ -279,7 +279,7 @@ class MockFrontend : public AppCacheFrontend { int num_total, int num_complete) OVERRIDE { if (!ignore_progress_events_) - OnEventRaised(host_ids, PROGRESS_EVENT); + OnEventRaised(host_ids, APPCACHE_PROGRESS_EVENT); if (verify_progress_events_) { EXPECT_GE(num_total, num_complete); @@ -316,7 +316,7 @@ class MockFrontend : public AppCacheFrontend { void AddExpectedEvent(const std::vector<int>& host_ids, AppCacheEventID event_id) { - DCHECK(!ignore_progress_events_ || event_id != PROGRESS_EVENT); + DCHECK(!ignore_progress_events_ || event_id != APPCACHE_PROGRESS_EVENT); expected_events_.push_back(RaisedEvent(host_ids, event_id)); } @@ -670,7 +670,7 @@ class AppCacheUpdateJobTest : public testing::Test, EXPECT_EQ(expected, events.size()); EXPECT_EQ(expected, events[0].first.size()); EXPECT_EQ(host.host_id(), events[0].first[0]); - EXPECT_EQ(CHECKING_EVENT, events[0].second); + EXPECT_EQ(APPCACHE_CHECKING_EVENT, events[0].second); // Abort as we're not testing actual URL fetches in this test. delete update; @@ -726,14 +726,14 @@ class AppCacheUpdateJobTest : public testing::Test, != host_ids.end()); EXPECT_TRUE(std::find(host_ids.begin(), host_ids.end(), host3.host_id()) != host_ids.end()); - EXPECT_EQ(CHECKING_EVENT, events[0].second); + EXPECT_EQ(APPCACHE_CHECKING_EVENT, events[0].second); events = mock_frontend2.raised_events_; expected = 1; EXPECT_EQ(expected, events.size()); EXPECT_EQ(expected, events[0].first.size()); // 1 host using frontend2 EXPECT_EQ(host2.host_id(), events[0].first[0]); - EXPECT_EQ(CHECKING_EVENT, events[0].second); + EXPECT_EQ(APPCACHE_CHECKING_EVENT, events[0].second); events = mock_frontend3.raised_events_; EXPECT_TRUE(events.empty()); @@ -766,7 +766,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -800,11 +800,11 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffected by update MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, ERROR_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -834,7 +834,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; // redirect is like a failed request frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -869,10 +869,10 @@ class AppCacheUpdateJobTest : public testing::Test, tested_manifest_ = EMPTY_MANIFEST; tested_manifest_path_override_ = "files/missing-mime-manifest"; MockFrontend::HostIds ids(1, host->host_id()); - frontend->AddExpectedEvent(ids, CHECKING_EVENT); - frontend->AddExpectedEvent(ids, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -905,11 +905,11 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffected by update MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, OBSOLETE_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_OBSOLETE_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, OBSOLETE_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_OBSOLETE_EVENT); WaitForUpdateToFinish(); } @@ -935,7 +935,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -961,7 +961,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; // treated like cache failure frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -994,11 +994,11 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffected by update MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, NO_UPDATE_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_NO_UPDATE_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, NO_UPDATE_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_NO_UPDATE_EVENT); WaitForUpdateToFinish(); } @@ -1033,11 +1033,11 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffected by update MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, NO_UPDATE_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_NO_UPDATE_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, NO_UPDATE_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_NO_UPDATE_EVENT); // Seed storage with expected manifest data. const std::string seed_data(kManifest1Contents); @@ -1081,8 +1081,8 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffected by update MockFrontend::HostIds id(1, host->host_id()); - frontend->AddExpectedEvent(id, CHECKING_EVENT); - frontend->AddExpectedEvent(id, ERROR_EVENT); + frontend->AddExpectedEvent(id, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(id, APPCACHE_ERROR_EVENT); frontend->expected_error_message_ = "Manifest entry not found in existing cache"; WaitForUpdateToFinish(); @@ -1122,7 +1122,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; tested_manifest_ = MANIFEST1; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1150,7 +1150,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; tested_manifest_ = MANIFEST_WITH_INTERCEPT; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1189,19 +1189,19 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // final - frontend2->AddExpectedEvent(ids2, UPDATE_READY_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // final + frontend2->AddExpectedEvent(ids2, APPCACHE_UPDATE_READY_EVENT); // Seed storage with expected manifest data different from manifest1. const std::string seed_data("different"); @@ -1251,12 +1251,12 @@ class AppCacheUpdateJobTest : public testing::Test, response_writer_->response_id())); tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids(1, host->host_id()); - frontend->AddExpectedEvent(ids, CHECKING_EVENT); - frontend->AddExpectedEvent(ids, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids, APPCACHE_UPDATE_READY_EVENT); // Seed storage with expected http response info for entry. Allow reuse. const char data[] = @@ -1310,12 +1310,12 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids(1, host->host_id()); - frontend->AddExpectedEvent(ids, CHECKING_EVENT); - frontend->AddExpectedEvent(ids, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids, APPCACHE_UPDATE_READY_EVENT); // Seed storage with expected http response info for entry. Do NOT // allow reuse by setting an expires header in the past. @@ -1370,12 +1370,12 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids(1, host->host_id()); - frontend->AddExpectedEvent(ids, CHECKING_EVENT); - frontend->AddExpectedEvent(ids, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids, APPCACHE_UPDATE_READY_EVENT); // Seed storage with expected http response info for entry: a vary header. const char data[] = @@ -1433,19 +1433,19 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST_MERGED_TYPES; MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // explicit1 - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // manifest - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // explicit1 + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // manifest + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // final - frontend2->AddExpectedEvent(ids2, UPDATE_READY_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // final + frontend2->AddExpectedEvent(ids2, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -1471,7 +1471,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; // 404 explicit url is cache failure frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1506,13 +1506,13 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffectd by failed update MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, ERROR_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -1588,27 +1588,27 @@ class AppCacheUpdateJobTest : public testing::Test, expect_response_ids_.insert(std::map<GURL, int64>::value_type( MockHttpServer::GetMockUrl("files/notmodified"), 555)); // copied MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // explicit1 - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // fallback1a - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // notfound - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // explicit2 - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // servererror - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // notmodified - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // explicit1 + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // fallback1a + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // notfound + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // explicit2 + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // servererror + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // notmodified + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // explicit1 - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // fallback1a - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // notfound - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // explicit2 - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // servererror - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // notmodified - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // final - frontend2->AddExpectedEvent(ids2, UPDATE_READY_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // explicit1 + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // fallback1a + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // notfound + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // explicit2 + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // servererror + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // notmodified + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // final + frontend2->AddExpectedEvent(ids2, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -1644,15 +1644,15 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = EMPTY_MANIFEST; MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // final - frontend2->AddExpectedEvent(ids2, UPDATE_READY_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // final + frontend2->AddExpectedEvent(ids2, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -1683,11 +1683,11 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; tested_manifest_ = EMPTY_FILE_MANIFEST; MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -1721,7 +1721,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1755,7 +1755,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1790,7 +1790,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1824,7 +1824,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = true; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1857,7 +1857,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = true; frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1886,7 +1886,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; // storage failed frontend->AddExpectedEvent(MockFrontend::HostIds(1, host->host_id()), - CHECKING_EVENT); + APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -1922,17 +1922,17 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // unchanged MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, ERROR_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -1970,7 +1970,7 @@ class AppCacheUpdateJobTest : public testing::Test, AppCacheHost* host = MakeHost(1, frontend); host->first_party_url_ = kManifestUrl; host->SelectCache(MockHttpServer::GetMockUrl("files/empty1"), - kNoCacheId, kManifestUrl); + kAppCacheNoCacheId, kManifestUrl); // Set up checks for when update job finishes. do_checks_after_update_finished_ = true; @@ -1980,7 +1980,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache.get(); // unchanged MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, ERROR_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); frontend->expected_error_message_ = "Failed to commit new cache to storage"; @@ -2019,11 +2019,11 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; expect_newest_cache_ = cache; // newest cache unaffected by update MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, ERROR_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2050,8 +2050,8 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, ERROR_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2077,8 +2077,8 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, ERROR_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2107,8 +2107,8 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, ERROR_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2137,9 +2137,9 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; // 404 fallback url is cache failure MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids1, ERROR_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2175,13 +2175,13 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_obsolete_ = false; expect_group_has_cache_ = false; // all pending masters failed MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, ERROR_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2224,19 +2224,19 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids3(1, host3->host_id()); - frontend3->AddExpectedEvent(ids3, CHECKING_EVENT); - frontend3->AddExpectedEvent(ids3, DOWNLOADING_EVENT); - frontend3->AddExpectedEvent(ids3, ERROR_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_CHECKING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_DOWNLOADING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_ERROR_EVENT); WaitForUpdateToFinish(); } @@ -2275,16 +2275,16 @@ class AppCacheUpdateJobTest : public testing::Test, MockHttpServer::GetMockUrl("files/explicit2"), AppCacheEntry(AppCacheEntry::MASTER))); MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, ERROR_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // final - frontend2->AddExpectedEvent(ids2, CACHED_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // final + frontend2->AddExpectedEvent(ids2, APPCACHE_CACHED_EVENT); WaitForUpdateToFinish(); } @@ -2329,22 +2329,22 @@ class AppCacheUpdateJobTest : public testing::Test, MockHttpServer::GetMockUrl("files/explicit2"), AppCacheEntry(AppCacheEntry::MASTER))); MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids3(1, host3->host_id()); - frontend3->AddExpectedEvent(ids3, CHECKING_EVENT); - frontend3->AddExpectedEvent(ids3, DOWNLOADING_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); // final - frontend3->AddExpectedEvent(ids3, UPDATE_READY_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_CHECKING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_DOWNLOADING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); // final + frontend3->AddExpectedEvent(ids3, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -2391,14 +2391,14 @@ class AppCacheUpdateJobTest : public testing::Test, expect_non_null_update_time_ = true; tested_manifest_ = PENDING_MASTER_NO_UPDATE; MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, NO_UPDATE_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_NO_UPDATE_EVENT); MockFrontend::HostIds ids3(1, host3->host_id()); - frontend2->AddExpectedEvent(ids3, CHECKING_EVENT); + frontend2->AddExpectedEvent(ids3, APPCACHE_CHECKING_EVENT); MockFrontend::HostIds ids2and3; ids2and3.push_back(host2->host_id()); ids2and3.push_back(host3->host_id()); - frontend2->AddExpectedEvent(ids2and3, NO_UPDATE_EVENT); + frontend2->AddExpectedEvent(ids2and3, APPCACHE_NO_UPDATE_EVENT); WaitForUpdateToFinish(); } @@ -2441,7 +2441,7 @@ class AppCacheUpdateJobTest : public testing::Test, MockFrontend* frontend5 = MakeMockFrontend(); AppCacheHost* host5 = MakeHost(5, frontend5); // no master entry url - frontend1->TriggerAdditionalUpdates(DOWNLOADING_EVENT, update); + frontend1->TriggerAdditionalUpdates(APPCACHE_DOWNLOADING_EVENT, update); frontend1->AdditionalUpdateHost(host2); // fetch will fail frontend1->AdditionalUpdateHost(host3); // same as an explicit entry frontend1->AdditionalUpdateHost(host4); // same as another master entry @@ -2457,35 +2457,35 @@ class AppCacheUpdateJobTest : public testing::Test, MockHttpServer::GetMockUrl("files/explicit2"), AppCacheEntry(AppCacheEntry::MASTER))); MockFrontend::HostIds ids1(1, host1->host_id()); - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, CACHED_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_CACHED_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids3(1, host3->host_id()); - frontend3->AddExpectedEvent(ids3, CHECKING_EVENT); - frontend3->AddExpectedEvent(ids3, DOWNLOADING_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); // final - frontend3->AddExpectedEvent(ids3, CACHED_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_CHECKING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_DOWNLOADING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); // final + frontend3->AddExpectedEvent(ids3, APPCACHE_CACHED_EVENT); MockFrontend::HostIds ids4(1, host4->host_id()); - frontend4->AddExpectedEvent(ids4, CHECKING_EVENT); - frontend4->AddExpectedEvent(ids4, DOWNLOADING_EVENT); - frontend4->AddExpectedEvent(ids4, PROGRESS_EVENT); - frontend4->AddExpectedEvent(ids4, PROGRESS_EVENT); - frontend4->AddExpectedEvent(ids4, PROGRESS_EVENT); // final - frontend4->AddExpectedEvent(ids4, CACHED_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_CHECKING_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_DOWNLOADING_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_PROGRESS_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_PROGRESS_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_PROGRESS_EVENT); // final + frontend4->AddExpectedEvent(ids4, APPCACHE_CACHED_EVENT); // Host 5 is not associated with cache so no progress/cached events. MockFrontend::HostIds ids5(1, host5->host_id()); - frontend5->AddExpectedEvent(ids5, CHECKING_EVENT); - frontend5->AddExpectedEvent(ids5, DOWNLOADING_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_CHECKING_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_DOWNLOADING_EVENT); WaitForUpdateToFinish(); } @@ -2538,7 +2538,7 @@ class AppCacheUpdateJobTest : public testing::Test, host6->new_master_entry_url_ = MockHttpServer::GetMockUrl("files/explicit1"); - frontend2->TriggerAdditionalUpdates(ERROR_EVENT, update); + frontend2->TriggerAdditionalUpdates(APPCACHE_ERROR_EVENT, update); frontend2->AdditionalUpdateHost(host3); frontend2->AdditionalUpdateHost(NULL); // no host frontend2->AdditionalUpdateHost(host4); // no master entry url @@ -2552,21 +2552,21 @@ class AppCacheUpdateJobTest : public testing::Test, expect_newest_cache_ = cache; // newest cache unaffected by update tested_manifest_ = PENDING_MASTER_NO_UPDATE; MockFrontend::HostIds ids1(1, host1->host_id()); // prior associated host - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, NO_UPDATE_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_NO_UPDATE_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, ERROR_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_ERROR_EVENT); MockFrontend::HostIds ids3(1, host3->host_id()); - frontend3->AddExpectedEvent(ids3, CHECKING_EVENT); - frontend3->AddExpectedEvent(ids3, NO_UPDATE_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_CHECKING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_NO_UPDATE_EVENT); MockFrontend::HostIds ids4(1, host4->host_id()); // unassociated w/cache - frontend4->AddExpectedEvent(ids4, CHECKING_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_CHECKING_EVENT); MockFrontend::HostIds ids5(1, host5->host_id()); - frontend5->AddExpectedEvent(ids5, CHECKING_EVENT); - frontend5->AddExpectedEvent(ids5, NO_UPDATE_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_CHECKING_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_NO_UPDATE_EVENT); MockFrontend::HostIds ids6(1, host6->host_id()); - frontend6->AddExpectedEvent(ids6, CHECKING_EVENT); - frontend6->AddExpectedEvent(ids6, NO_UPDATE_EVENT); + frontend6->AddExpectedEvent(ids6, APPCACHE_CHECKING_EVENT); + frontend6->AddExpectedEvent(ids6, APPCACHE_NO_UPDATE_EVENT); WaitForUpdateToFinish(); } @@ -2609,7 +2609,7 @@ class AppCacheUpdateJobTest : public testing::Test, host5->new_master_entry_url_ = MockHttpServer::GetMockUrl("files/explicit2"); - frontend1->TriggerAdditionalUpdates(PROGRESS_EVENT, update); + frontend1->TriggerAdditionalUpdates(APPCACHE_PROGRESS_EVENT, update); frontend1->AdditionalUpdateHost(host2); // same as entry in manifest frontend1->AdditionalUpdateHost(NULL); // no host frontend1->AdditionalUpdateHost(host3); // new master entry @@ -2625,33 +2625,33 @@ class AppCacheUpdateJobTest : public testing::Test, MockHttpServer::GetMockUrl("files/explicit2"), AppCacheEntry(AppCacheEntry::MASTER))); MockFrontend::HostIds ids1(1, host1->host_id()); // prior associated host - frontend1->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend1->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend1->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend1->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend1->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend1->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids2(1, host2->host_id()); - frontend2->AddExpectedEvent(ids2, CHECKING_EVENT); - frontend2->AddExpectedEvent(ids2, DOWNLOADING_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); - frontend2->AddExpectedEvent(ids2, PROGRESS_EVENT); // final - frontend2->AddExpectedEvent(ids2, UPDATE_READY_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_CHECKING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_DOWNLOADING_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); + frontend2->AddExpectedEvent(ids2, APPCACHE_PROGRESS_EVENT); // final + frontend2->AddExpectedEvent(ids2, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids3(1, host3->host_id()); - frontend3->AddExpectedEvent(ids3, CHECKING_EVENT); - frontend3->AddExpectedEvent(ids3, DOWNLOADING_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); - frontend3->AddExpectedEvent(ids3, PROGRESS_EVENT); // final - frontend3->AddExpectedEvent(ids3, UPDATE_READY_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_CHECKING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_DOWNLOADING_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); + frontend3->AddExpectedEvent(ids3, APPCACHE_PROGRESS_EVENT); // final + frontend3->AddExpectedEvent(ids3, APPCACHE_UPDATE_READY_EVENT); MockFrontend::HostIds ids4(1, host4->host_id()); // unassociated w/cache - frontend4->AddExpectedEvent(ids4, CHECKING_EVENT); - frontend4->AddExpectedEvent(ids4, DOWNLOADING_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_CHECKING_EVENT); + frontend4->AddExpectedEvent(ids4, APPCACHE_DOWNLOADING_EVENT); MockFrontend::HostIds ids5(1, host5->host_id()); - frontend5->AddExpectedEvent(ids5, CHECKING_EVENT); - frontend5->AddExpectedEvent(ids5, DOWNLOADING_EVENT); - frontend5->AddExpectedEvent(ids5, PROGRESS_EVENT); - frontend5->AddExpectedEvent(ids5, PROGRESS_EVENT); // final - frontend5->AddExpectedEvent(ids5, UPDATE_READY_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_CHECKING_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_DOWNLOADING_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_PROGRESS_EVENT); + frontend5->AddExpectedEvent(ids5, APPCACHE_PROGRESS_EVENT); // final + frontend5->AddExpectedEvent(ids5, APPCACHE_UPDATE_READY_EVENT); WaitForUpdateToFinish(); } @@ -2695,14 +2695,15 @@ class AppCacheUpdateJobTest : public testing::Test, expect_extra_entries_.insert(AppCache::EntryMap::value_type( host->new_master_entry_url_, AppCacheEntry(AppCacheEntry::MASTER))); MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids1, CACHED_EVENT); - - // Group status will be IDLE so cannot call WaitForUpdateToFinish. + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids1, APPCACHE_CACHED_EVENT); + + // Group status will be APPCACHE_STATUS_IDLE so cannot call + // WaitForUpdateToFinish. group_->AddUpdateObserver(this); } @@ -2812,12 +2813,12 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); // Seed storage with expected manifest response info that will cause // an If-Modified-Since header to be put in the manifest fetch request. @@ -2875,12 +2876,12 @@ class AppCacheUpdateJobTest : public testing::Test, expect_old_cache_ = cache; tested_manifest_ = MANIFEST1; MockFrontend::HostIds ids1(1, host->host_id()); - frontend->AddExpectedEvent(ids1, CHECKING_EVENT); - frontend->AddExpectedEvent(ids1, DOWNLOADING_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); - frontend->AddExpectedEvent(ids1, PROGRESS_EVENT); // final - frontend->AddExpectedEvent(ids1, UPDATE_READY_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_CHECKING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_DOWNLOADING_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); + frontend->AddExpectedEvent(ids1, APPCACHE_PROGRESS_EVENT); // final + frontend->AddExpectedEvent(ids1, APPCACHE_UPDATE_READY_EVENT); // Seed storage with expected manifest response info that will cause // an If-None-Match header to be put in the manifest fetch request. @@ -3000,7 +3001,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = true; tested_manifest_ = NONE; MockFrontend::HostIds host_ids(1, host->host_id()); - frontend->AddExpectedEvent(host_ids, CHECKING_EVENT); + frontend->AddExpectedEvent(host_ids, APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -3028,7 +3029,7 @@ class AppCacheUpdateJobTest : public testing::Test, expect_group_has_cache_ = false; tested_manifest_ = NONE; MockFrontend::HostIds host_ids(1, host->host_id()); - frontend->AddExpectedEvent(host_ids, CHECKING_EVENT); + frontend->AddExpectedEvent(host_ids, APPCACHE_CHECKING_EVENT); WaitForUpdateToFinish(); } @@ -3161,7 +3162,7 @@ class AppCacheUpdateJobTest : public testing::Test, group_->newest_complete_cache()->entries(); for (AppCache::EntryMap::const_iterator it = entries.begin(); it != entries.end(); ++it) { - EXPECT_NE(kNoResponseId, it->second.response_id()); + EXPECT_NE(kAppCacheNoResponseId, it->second.response_id()); // Check that any copied entries have the expected response id // and that entries that are not copied have a different response id. @@ -3273,7 +3274,7 @@ class AppCacheUpdateJobTest : public testing::Test, ASSERT_EQ(expected, cache->fallback_namespaces_.size()); EXPECT_TRUE(cache->fallback_namespaces_[0] == Namespace( - FALLBACK_NAMESPACE, + APPCACHE_FALLBACK_NAMESPACE, MockHttpServer::GetMockUrl("files/fallback1"), MockHttpServer::GetMockUrl("files/fallback1a"), false)); @@ -3301,7 +3302,7 @@ class AppCacheUpdateJobTest : public testing::Test, ASSERT_EQ(expected, cache->fallback_namespaces_.size()); EXPECT_TRUE(cache->fallback_namespaces_[0] == Namespace( - FALLBACK_NAMESPACE, + APPCACHE_FALLBACK_NAMESPACE, MockHttpServer::GetMockUrl("files/fallback1"), MockHttpServer::GetMockUrl("files/explicit1"), false)); @@ -3309,7 +3310,7 @@ class AppCacheUpdateJobTest : public testing::Test, EXPECT_EQ(expected, cache->online_whitelist_namespaces_.size()); EXPECT_TRUE(cache->online_whitelist_namespaces_[0] == Namespace( - NETWORK_NAMESPACE, + APPCACHE_NETWORK_NAMESPACE, MockHttpServer::GetMockUrl("files/online1"), GURL(), false)); EXPECT_FALSE(cache->online_whitelist_all_); @@ -3464,7 +3465,7 @@ TEST_F(AppCacheUpdateJobTest, AlreadyChecking) { EXPECT_EQ(expected, events.size()); EXPECT_EQ(expected, events[0].first.size()); EXPECT_EQ(host.host_id(), events[0].first[0]); - EXPECT_EQ(CHECKING_EVENT, events[0].second); + EXPECT_EQ(APPCACHE_CHECKING_EVENT, events[0].second); EXPECT_EQ(AppCacheGroup::CHECKING, group->update_status()); } @@ -3493,11 +3494,11 @@ TEST_F(AppCacheUpdateJobTest, AlreadyDownloading) { expected = 1; EXPECT_EQ(expected, events[0].first.size()); EXPECT_EQ(host.host_id(), events[0].first[0]); - EXPECT_EQ(CHECKING_EVENT, events[0].second); + EXPECT_EQ(APPCACHE_CHECKING_EVENT, events[0].second); EXPECT_EQ(expected, events[1].first.size()); EXPECT_EQ(host.host_id(), events[1].first[0]); - EXPECT_EQ(appcache::DOWNLOADING_EVENT, events[1].second); + EXPECT_EQ(appcache::APPCACHE_DOWNLOADING_EVENT, events[1].second); EXPECT_EQ(AppCacheGroup::DOWNLOADING, group->update_status()); } diff --git a/content/browser/appcache/appcache_url_request_job_unittest.cc b/content/browser/appcache/appcache_url_request_job_unittest.cc index 86748d6..edaa07e 100644 --- a/content/browser/appcache/appcache_url_request_job_unittest.cc +++ b/content/browser/appcache/appcache_url_request_job_unittest.cc @@ -32,7 +32,7 @@ using appcache::AppCacheResponseReader; using appcache::AppCacheResponseWriter; using appcache::AppCacheURLRequestJob; using appcache::HttpResponseInfoIOBuffer; -using appcache::kNoCacheId; +using appcache::kAppCacheNoCacheId; using net::IOBuffer; using net::WrappedIOBuffer; @@ -439,7 +439,7 @@ class AppCacheURLRequestJobTest : public testing::Test { EXPECT_FALSE(job->has_been_started()); EXPECT_FALSE(job->has_been_killed()); EXPECT_EQ(GURL(), job->manifest_url()); - EXPECT_EQ(kNoCacheId, job->cache_id()); + EXPECT_EQ(kAppCacheNoCacheId, job->cache_id()); EXPECT_FALSE(job->entry().has_response_id()); TestFinished(); diff --git a/content/browser/appcache/manifest_parser_unittest.cc b/content/browser/appcache/manifest_parser_unittest.cc index 7b88220..8a44376 100644 --- a/content/browser/appcache/manifest_parser_unittest.cc +++ b/content/browser/appcache/manifest_parser_unittest.cc @@ -10,9 +10,9 @@ using appcache::Manifest; using appcache::NamespaceVector; -using appcache::FALLBACK_NAMESPACE; -using appcache::INTERCEPT_NAMESPACE; -using appcache::NETWORK_NAMESPACE; +using appcache::APPCACHE_FALLBACK_NAMESPACE; +using appcache::APPCACHE_INTERCEPT_NAMESPACE; +using appcache::APPCACHE_NETWORK_NAMESPACE; using appcache::PARSE_MANIFEST_ALLOWING_INTERCEPTS; using appcache::PARSE_MANIFEST_PER_STANDARD; @@ -170,7 +170,7 @@ TEST(AppCacheManifestParserTest, WhitelistUrls) { const NamespaceVector& online = manifest.online_whitelist_namespaces; const size_t kExpected = 6; ASSERT_EQ(kExpected, online.size()); - EXPECT_EQ(NETWORK_NAMESPACE, online[0].type); + EXPECT_EQ(APPCACHE_NETWORK_NAMESPACE, online[0].type); EXPECT_FALSE(online[0].is_pattern); EXPECT_TRUE(online[0].target_url.is_empty()); EXPECT_EQ(GURL("http://www.bar.com/relative/one"), online[0].namespace_url); @@ -216,11 +216,11 @@ TEST(AppCacheManifestParserTest, FallbackUrls) { const NamespaceVector& fallbacks = manifest.fallback_namespaces; const size_t kExpected = 5; ASSERT_EQ(kExpected, fallbacks.size()); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[0].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[1].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[2].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[3].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[4].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[0].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[1].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[2].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[3].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[4].type); EXPECT_EQ(GURL("http://glorp.com/relative/one"), fallbacks[0].namespace_url); EXPECT_EQ(GURL("http://glorp.com/onefb"), @@ -267,9 +267,9 @@ TEST(AppCacheManifestParserTest, FallbackUrlsWithPort) { const NamespaceVector& fallbacks = manifest.fallback_namespaces; const size_t kExpected = 3; ASSERT_EQ(kExpected, fallbacks.size()); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[0].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[1].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[2].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[0].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[1].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[2].type); EXPECT_EQ(GURL("http://www.portme.com:1234/one"), fallbacks[0].namespace_url); EXPECT_EQ(GURL("http://www.portme.com:1234/relative/onefb"), @@ -311,9 +311,9 @@ TEST(AppCacheManifestParserTest, InterceptUrls) { const NamespaceVector& intercepts = manifest.intercept_namespaces; const size_t kExpected = 3; ASSERT_EQ(kExpected, intercepts.size()); - EXPECT_EQ(INTERCEPT_NAMESPACE, intercepts[0].type); - EXPECT_EQ(INTERCEPT_NAMESPACE, intercepts[1].type); - EXPECT_EQ(INTERCEPT_NAMESPACE, intercepts[2].type); + EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, intercepts[0].type); + EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, intercepts[1].type); + EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, intercepts[2].type); EXPECT_EQ(GURL("http://www.portme.com:1234/one"), intercepts[0].namespace_url); EXPECT_EQ(GURL("http://www.portme.com:1234/relative/int1"), @@ -387,8 +387,8 @@ TEST(AppCacheManifestParserTest, ComboUrls) { const NamespaceVector& fallbacks = manifest.fallback_namespaces; expected = 2; ASSERT_EQ(expected, fallbacks.size()); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[0].type); - EXPECT_EQ(FALLBACK_NAMESPACE, fallbacks[1].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[0].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, fallbacks[1].type); EXPECT_EQ(GURL("http://combo.com:42/fallback-1"), fallbacks[0].namespace_url); EXPECT_EQ(GURL("http://combo.com:42/fallback-1b"), @@ -483,9 +483,11 @@ TEST(AppCacheManifestParserTest, PatternMatching) { EXPECT_EQ(3u, manifest.intercept_namespaces.size()); EXPECT_EQ(2u, manifest.fallback_namespaces.size()); EXPECT_EQ(2u, manifest.online_whitelist_namespaces.size()); - EXPECT_EQ(INTERCEPT_NAMESPACE, manifest.intercept_namespaces[0].type); - EXPECT_EQ(FALLBACK_NAMESPACE, manifest.fallback_namespaces[0].type); - EXPECT_EQ(NETWORK_NAMESPACE, manifest.online_whitelist_namespaces[0].type); + EXPECT_EQ(APPCACHE_INTERCEPT_NAMESPACE, + manifest.intercept_namespaces[0].type); + EXPECT_EQ(APPCACHE_FALLBACK_NAMESPACE, manifest.fallback_namespaces[0].type); + EXPECT_EQ(APPCACHE_NETWORK_NAMESPACE, + manifest.online_whitelist_namespaces[0].type); EXPECT_FALSE(manifest.intercept_namespaces[0].is_pattern); EXPECT_TRUE(manifest.intercept_namespaces[1].is_pattern); EXPECT_TRUE(manifest.intercept_namespaces[2].is_pattern); diff --git a/content/browser/appcache/mock_appcache_storage.cc b/content/browser/appcache/mock_appcache_storage.cc index 401a60e..ea9673d 100644 --- a/content/browser/appcache/mock_appcache_storage.cc +++ b/content/browser/appcache/mock_appcache_storage.cc @@ -27,9 +27,9 @@ using appcache::AppCacheResponseWriter; using appcache::AppCacheServiceImpl; -using appcache::FALLBACK_NAMESPACE; -using appcache::INTERCEPT_NAMESPACE; -using appcache::kNoCacheId; +using appcache::APPCACHE_FALLBACK_NAMESPACE; +using appcache::APPCACHE_INTERCEPT_NAMESPACE; +using appcache::kAppCacheNoCacheId; using appcache::AppCacheNamespaceType; namespace content { @@ -40,7 +40,7 @@ MockAppCacheStorage::MockAppCacheStorage(AppCacheServiceImpl* service) simulate_store_group_and_newest_cache_failure_(false), simulate_find_main_resource_(false), simulate_find_sub_resource_(false), - simulated_found_cache_id_(kNoCacheId), + simulated_found_cache_id_(kAppCacheNoCacheId), simulated_found_group_id_(0), simulated_found_network_namespace_(false), weak_factory_(this) { @@ -254,7 +254,7 @@ struct FoundCandidate { bool is_cache_in_use; FoundCandidate() - : cache_id(kNoCacheId), group_id(0), is_cache_in_use(false) {} + : cache_id(kAppCacheNoCacheId), group_id(0), is_cache_in_use(false) {} }; void MaybeTakeNewNamespaceEntry( @@ -289,7 +289,7 @@ void MaybeTakeNewNamespaceEntry( } if (take_new_entry) { - if (namespace_type == FALLBACK_NAMESPACE) { + if (namespace_type == APPCACHE_FALLBACK_NAMESPACE) { best_candidate->namespace_entry_url = cache->GetFallbackEntryUrl(namespace_url); } else { @@ -383,14 +383,14 @@ void MockAppCacheStorage::ProcessFindResponseForMainRequest( } else if (found_entry.has_response_id() && !found_intercept_namespace.is_empty()) { MaybeTakeNewNamespaceEntry( - INTERCEPT_NAMESPACE, + APPCACHE_INTERCEPT_NAMESPACE, found_entry, found_intercept_namespace, is_in_use, &found_candidate, &found_intercept_candidate_namespace, cache, group); } else { DCHECK(found_fallback_entry.has_response_id()); MaybeTakeNewNamespaceEntry( - FALLBACK_NAMESPACE, + APPCACHE_FALLBACK_NAMESPACE, found_fallback_entry, found_fallback_namespace, is_in_use, &found_fallback_candidate, &found_fallback_candidate_namespace, cache, group); @@ -420,7 +420,8 @@ void MockAppCacheStorage::ProcessFindResponseForMainRequest( // Didn't find anything. delegate_ref->delegate->OnMainResponseFound( - url, AppCacheEntry(), GURL(), AppCacheEntry(), kNoCacheId, 0, GURL()); + url, AppCacheEntry(), GURL(), AppCacheEntry(), kAppCacheNoCacheId, 0, + GURL()); } void MockAppCacheStorage::ProcessMakeGroupObsolete( diff --git a/content/browser/appcache/mock_appcache_storage.h b/content/browser/appcache/mock_appcache_storage.h index a9e9582..5d31748 100644 --- a/content/browser/appcache/mock_appcache_storage.h +++ b/content/browser/appcache/mock_appcache_storage.h @@ -29,7 +29,7 @@ using appcache::AppCacheResponseReader; using appcache::AppCacheResponseWriter; using appcache::AppCacheServiceImpl; using appcache::AppCacheStorage; -using appcache::kNoCacheId; +using appcache::kAppCacheNoCacheId; namespace content { FORWARD_DECLARE_TEST(AppCacheServiceImplTest, DeleteAppCachesForOrigin); @@ -188,7 +188,7 @@ class MockAppCacheStorage : public AppCacheStorage { simulate_find_sub_resource_ = true; simulated_found_entry_ = entry; simulated_found_fallback_entry_ = fallback_entry; - simulated_found_cache_id_ = kNoCacheId; // N/A to sub resource loads + simulated_found_cache_id_ = kAppCacheNoCacheId; // N/A to sub resource loads simulated_found_manifest_url_ = GURL(); // N/A to sub resource loads simulated_found_group_id_ = 0; // N/A to sub resource loads simulated_found_network_namespace_ = network_namespace; diff --git a/content/browser/appcache/mock_appcache_storage_unittest.cc b/content/browser/appcache/mock_appcache_storage_unittest.cc index e3e6df0..f1c9149 100644 --- a/content/browser/appcache/mock_appcache_storage_unittest.cc +++ b/content/browser/appcache/mock_appcache_storage_unittest.cc @@ -14,13 +14,13 @@ using appcache::AppCache; using appcache::AppCacheEntry; using appcache::AppCacheGroup; using appcache::AppCacheStorage; -using appcache::FALLBACK_NAMESPACE; -using appcache::INTERCEPT_NAMESPACE; -using appcache::kNoCacheId; -using appcache::kNoResponseId; +using appcache::APPCACHE_FALLBACK_NAMESPACE; +using appcache::APPCACHE_INTERCEPT_NAMESPACE; +using appcache::kAppCacheNoCacheId; +using appcache::kAppCacheNoResponseId; using appcache::Manifest; using appcache::Namespace; -using appcache::NETWORK_NAMESPACE; +using appcache::APPCACHE_NETWORK_NAMESPACE; namespace content { @@ -30,7 +30,7 @@ class MockAppCacheStorageTest : public testing::Test { public: explicit MockStorageDelegate() : loaded_cache_id_(0), stored_group_success_(false), - obsoleted_success_(false), found_cache_id_(kNoCacheId) { + obsoleted_success_(false), found_cache_id_(kAppCacheNoCacheId) { } virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) OVERRIDE { @@ -420,9 +420,10 @@ TEST_F(MockAppCacheStorageTest, FindNoMainResponse) { base::RunLoop().RunUntilIdle(); // Do async task execution. EXPECT_EQ(url, delegate.found_url_); EXPECT_TRUE(delegate.found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate.found_cache_id_); - EXPECT_EQ(kNoResponseId, delegate.found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate.found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoCacheId, delegate.found_cache_id_); + EXPECT_EQ(kAppCacheNoResponseId, delegate.found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate.found_fallback_entry_.response_id()); EXPECT_TRUE(delegate.found_fallback_url_.is_empty()); EXPECT_EQ(0, delegate.found_entry_.types()); EXPECT_EQ(0, delegate.found_fallback_entry_.types()); @@ -482,10 +483,10 @@ TEST_F(MockAppCacheStorageTest, BasicFindMainFallbackResponse) { Manifest manifest; manifest.fallback_namespaces.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespaceUrl1, + Namespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackNamespaceUrl1, kFallbackEntryUrl1, false)); manifest.fallback_namespaces.push_back( - Namespace(FALLBACK_NAMESPACE, kFallbackNamespaceUrl2, + Namespace(APPCACHE_FALLBACK_NAMESPACE, kFallbackNamespaceUrl2, kFallbackEntryUrl2, false)); scoped_refptr<AppCache> cache(new AppCache(service.storage(), kCacheId)); @@ -594,7 +595,7 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) { Manifest manifest; manifest.online_whitelist_namespaces.push_back( - Namespace(NETWORK_NAMESPACE, kOnlineNamespaceUrl, + Namespace(APPCACHE_NETWORK_NAMESPACE, kOnlineNamespaceUrl, GURL(), false)); scoped_refptr<AppCache> cache(new AppCache(service.storage(), kCacheId)); cache->InitializeWithManifest(&manifest); @@ -618,9 +619,10 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) { base::RunLoop().RunUntilIdle(); // Do async task execution. EXPECT_EQ(kEntryUrl, delegate.found_url_); EXPECT_TRUE(delegate.found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate.found_cache_id_); - EXPECT_EQ(kNoResponseId, delegate.found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate.found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoCacheId, delegate.found_cache_id_); + EXPECT_EQ(kAppCacheNoResponseId, delegate.found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate.found_fallback_entry_.response_id()); EXPECT_TRUE(delegate.found_fallback_url_.is_empty()); EXPECT_EQ(0, delegate.found_entry_.types()); EXPECT_EQ(0, delegate.found_fallback_entry_.types()); @@ -632,9 +634,10 @@ TEST_F(MockAppCacheStorageTest, FindMainResponseExclusions) { base::RunLoop().RunUntilIdle(); // Do async task execution. EXPECT_EQ(kOnlineNamespaceUrl, delegate.found_url_); EXPECT_TRUE(delegate.found_manifest_url_.is_empty()); - EXPECT_EQ(kNoCacheId, delegate.found_cache_id_); - EXPECT_EQ(kNoResponseId, delegate.found_entry_.response_id()); - EXPECT_EQ(kNoResponseId, delegate.found_fallback_entry_.response_id()); + EXPECT_EQ(kAppCacheNoCacheId, delegate.found_cache_id_); + EXPECT_EQ(kAppCacheNoResponseId, delegate.found_entry_.response_id()); + EXPECT_EQ(kAppCacheNoResponseId, + delegate.found_fallback_entry_.response_id()); EXPECT_TRUE(delegate.found_fallback_url_.is_empty()); EXPECT_EQ(0, delegate.found_entry_.types()); EXPECT_EQ(0, delegate.found_fallback_entry_.types()); |