appcache: add another obsolete test with origin trial

This change turns back on (it's explicitly turned off in the test base
class) the require appcache origin trial feature for several manifest
404/410 tests.  It also adds a 410 gone test for an upgrade scenario.

Bug: 1081907
Change-Id: I533f6ddfc6d45b4f73de5a82af159d77479dacbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225385Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773856}

content/browser/appcache/appcache_update_job_unittest.cc

@@ -1060,7 +1060,7 @@ class AppCacheUpdateJobTest : public testing::Test,
     WaitForUpdateToFinish();
   }
 
-  void ManifestGoneTest() {
+  void ManifestGoneFetchTest() {
     MakeService();
     group_ = base::MakeRefCounted<AppCacheGroup>(
         service_->storage(), MockHttpServer::GetMockUrl("files/gone"),
@@ -1083,6 +1083,36 @@ class AppCacheUpdateJobTest : public testing::Test,
     WaitForUpdateToFinish();
   }
 
+  void ManifestGoneUpgradeTest() {
+    MakeService();
+    group_ = base::MakeRefCounted<AppCacheGroup>(
+        service_->storage(), MockHttpServer::GetMockUrl("files/gone"),
+        service_->storage()->NewGroupId());
+    AppCacheUpdateJob* update =
+        new AppCacheUpdateJob(service_.get(), group_.get());
+    group_->update_job_ = update;
+
+    MockFrontend* frontend = MakeMockFrontend();
+    AppCacheHost* host = MakeHost(frontend);
+
+    AppCache* cache = MakeCacheForGroup(1, 111);
+    host->AssociateCompleteCache(cache);
+
+    update->StartUpdate(nullptr, GURL());
+
+    // Set up checks for when update job finishes.
+    do_checks_after_update_finished_ = true;
+    expect_group_obsolete_ = true;
+    expect_group_has_cache_ = true;
+    expect_newest_cache_ = cache;  // newest cache unaffected by update
+    frontend->AddExpectedEvent(
+        blink::mojom::AppCacheEventID::APPCACHE_CHECKING_EVENT);
+    frontend->AddExpectedEvent(
+        blink::mojom::AppCacheEventID::APPCACHE_OBSOLETE_EVENT);
+
+    WaitForUpdateToFinish();
+  }
+
   void CacheAttemptNotModifiedTest() {
     MakeService();
     group_ = base::MakeRefCounted<AppCacheGroup>(
@@ -5165,11 +5195,21 @@ TEST_F(AppCacheUpdateJobTest, ManifestMissingMimeTypeTest) {
 }
 
 TEST_F(AppCacheUpdateJobTest, ManifestNotFound) {
+  base::test::ScopedFeatureList f;
+  f.InitAndEnableFeature(blink::features::kAppCacheRequireOriginTrial);
   RunTestOnUIThread(&AppCacheUpdateJobTest::ManifestNotFoundTest);
 }
 
-TEST_F(AppCacheUpdateJobTest, ManifestGone) {
-  RunTestOnUIThread(&AppCacheUpdateJobTest::ManifestGoneTest);
+TEST_F(AppCacheUpdateJobTest, ManifestGoneFetch) {
+  base::test::ScopedFeatureList f;
+  f.InitAndEnableFeature(blink::features::kAppCacheRequireOriginTrial);
+  RunTestOnUIThread(&AppCacheUpdateJobTest::ManifestGoneFetchTest);
+}
+
+TEST_F(AppCacheUpdateJobTest, ManifestGoneUpgrade) {
+  base::test::ScopedFeatureList f;
+  f.InitAndEnableFeature(blink::features::kAppCacheRequireOriginTrial);
+  RunTestOnUIThread(&AppCacheUpdateJobTest::ManifestGoneUpgradeTest);
 }
 
 TEST_F(AppCacheUpdateJobTest, CacheAttemptNotModified) {
@@ -5375,6 +5415,8 @@ TEST_F(AppCacheUpdateJobTest, UpgradeFailStoreNewestCache) {
 }
 
 TEST_F(AppCacheUpdateJobTest, UpgradeFailMakeGroupObsolete) {
+  base::test::ScopedFeatureList f;
+  f.InitAndEnableFeature(blink::features::kAppCacheRequireOriginTrial);
   RunTestOnUIThread(&AppCacheUpdateJobTest::UpgradeFailMakeGroupObsoleteTest);
 }