diff options
author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 06:04:49 +0000 |
---|---|---|
committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 06:04:49 +0000 |
commit | ca10046545d16cfd705fbfc356d97710f47cedee (patch) | |
tree | 66d60515921d0229911b12c318b39bfda2c2e00b /webkit/appcache/appcache_storage_impl_unittest.cc | |
parent | 71aaa7aa371e39947d951addfcdf32f2cda353ac (diff) | |
download | chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.zip chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.tar.gz chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.tar.bz2 |
Failed compile on Chromium builder dbg
Revert 52072 - Pass notifications to the browser on access to the appcache main resource manifest.
BUG=45230
TEST=browser_tests
Review URL: http://codereview.chromium.org/2808046
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/2925008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_storage_impl_unittest.cc')
-rw-r--r-- | webkit/appcache/appcache_storage_impl_unittest.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc index fa3c367..204f5e6 100644 --- a/webkit/appcache/appcache_storage_impl_unittest.cc +++ b/webkit/appcache/appcache_storage_impl_unittest.cc @@ -74,7 +74,7 @@ class AppCacheStorageImplTest : public testing::Test { explicit MockStorageDelegate(AppCacheStorageImplTest* test) : loaded_cache_id_(0), stored_group_success_(false), obsoleted_success_(false), found_cache_id_(kNoCacheId), - found_blocked_by_policy_(false), test_(test) { + test_(test) { } void OnCacheLoaded(AppCache* cache, int64 cache_id) { @@ -113,7 +113,6 @@ class AppCacheStorageImplTest : public testing::Test { found_fallback_entry_ = fallback_entry; found_cache_id_ = cache_id; found_manifest_url_ = manifest_url; - found_blocked_by_policy_ = was_blocked_by_policy; test_->ScheduleNextTask(); } @@ -131,7 +130,6 @@ class AppCacheStorageImplTest : public testing::Test { AppCacheEntry found_fallback_entry_; int64 found_cache_id_; GURL found_manifest_url_; - bool found_blocked_by_policy_; AppCacheStorageImplTest* test_; }; @@ -684,9 +682,7 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindNoMainResponse() { EXPECT_EQ(kEntryUrl, delegate()->found_url_); - // If the request was blocked by a policy, the manifest url is still valid. - EXPECT_TRUE(delegate()->found_manifest_url_.is_empty() || - delegate()->found_blocked_by_policy_); + 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()); @@ -746,7 +742,6 @@ class AppCacheStorageImplTest : public testing::Test { if (policy_.can_load_return_value_) { EXPECT_EQ(kEntryUrl, delegate()->found_url_); EXPECT_EQ(kManifestUrl, delegate()->found_manifest_url_); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(1, delegate()->found_cache_id_); EXPECT_EQ(1, delegate()->found_entry_.response_id()); EXPECT_TRUE(delegate()->found_entry_.IsExplicit()); @@ -805,7 +800,6 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_BasicFindMainFallbackResponse() { EXPECT_EQ(kFallbackTestUrl, delegate()->found_url_); EXPECT_EQ(kManifestUrl, delegate()->found_manifest_url_); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(1, delegate()->found_cache_id_); EXPECT_FALSE(delegate()->found_entry_.has_response_id()); EXPECT_EQ(2, delegate()->found_fallback_entry_.response_id()); @@ -852,7 +846,6 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_FindMainResponseWithMultipleHits() { EXPECT_EQ(kEntryUrl, delegate()->found_url_); EXPECT_EQ(kManifestUrl2, delegate()->found_manifest_url_); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(2, delegate()->found_cache_id_); EXPECT_EQ(2, delegate()->found_entry_.response_id()); EXPECT_TRUE(delegate()->found_entry_.IsExplicit()); @@ -901,7 +894,6 @@ class AppCacheStorageImplTest : public testing::Test { void Verify_NotFound(GURL expected_url, bool test_finished) { EXPECT_EQ(expected_url, delegate()->found_url_); EXPECT_TRUE(delegate()->found_manifest_url_.is_empty()); - EXPECT_FALSE(delegate()->found_blocked_by_policy_); EXPECT_EQ(kNoCacheId, delegate()->found_cache_id_); EXPECT_EQ(kNoResponseId, delegate()->found_entry_.response_id()); EXPECT_EQ(kNoResponseId, delegate()->found_fallback_entry_.response_id()); |