Select a more appropiate appcache based on the opener or the parent of the new document.

webkit/appcache/appcache_request_handler_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stack>
 #include <string>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 204 matching lines @@
     EXPECT_EQ(kNoCacheId, cache_id);
     EXPECT_EQ(GURL(), manifest_url);
 
     AppCacheURLRequestJob* fallback_job;
     fallback_job = handler_->MaybeLoadFallbackForRedirect(
         request_.get(), GURL("http://blah/redirect"));
     EXPECT_FALSE(fallback_job);
     fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get());
     EXPECT_FALSE(fallback_job);
 
+    EXPECT_TRUE(host_->preferred_manifest_url().is_empty());
+
     TestFinished();
   }
 
   // MainResource_Hit --------------------------------------------------
 
   void MainResource_Hit() {
     PushNextTask(NewRunnableMethod(
        this, &AppCacheRequestHandlerTest::Verify_MainResource_Hit));
 
     request_.reset(new MockURLRequest(GURL("http://blah/")));
@@ skipping 21 matching lines @@
     int64 cache_id = kNoCacheId;
     GURL manifest_url;
     handler_->GetExtraResponseInfo(&cache_id, &manifest_url);
     EXPECT_EQ(1, cache_id);
     EXPECT_EQ(GURL("http://blah/manifest/"), manifest_url);
 
     AppCacheURLRequestJob* fallback_job;
     fallback_job = handler_->MaybeLoadFallbackForResponse(request_.get());
     EXPECT_FALSE(fallback_job);
 
+    EXPECT_EQ(GURL("http://blah/manifest/"),
+              host_->preferred_manifest_url());
+
     TestFinished();
   }
 
   // MainResource_Fallback --------------------------------------------------
 
   void MainResource_Fallback() {
     PushNextTask(NewRunnableMethod(
        this, &AppCacheRequestHandlerTest::Verify_MainResource_Fallback));
 
     request_.reset(new MockURLRequest(GURL("http://blah/")));
@@ skipping 33 matching lines @@
     EXPECT_TRUE(job_->is_delivering_appcache_response());
 
     int64 cache_id = kNoCacheId;
     GURL manifest_url;
     handler_->GetExtraResponseInfo(&cache_id, &manifest_url);
     EXPECT_EQ(1, cache_id);
     EXPECT_EQ(GURL("http://blah/manifest/"), manifest_url);
     EXPECT_TRUE(host_->main_resource_was_fallback_);
     EXPECT_EQ(GURL("http://blah/fallbackurl"), host_->fallback_url_);
 
+    EXPECT_EQ(GURL("http://blah/manifest/"),
+              host_->preferred_manifest_url());
+
     TestFinished();
   }
 
   // SubResource_Miss_WithNoCacheSelected ----------------------------------
 
   void SubResource_Miss_WithNoCacheSelected() {
     request_.reset(new MockURLRequest(GURL("http://blah/")));
     handler_.reset(host_->CreateRequestHandler(request_.get(),
                                                ResourceType::SUB_RESOURCE));
 
@@ skipping 29 matching lines @@
 
     TestFinished();
   }
 
   // SubResource_Miss_WithWaitForCacheSelection -----------------------------
 
   void SubResource_Miss_WithWaitForCacheSelection() {
     // Precondition, the host is waiting on cache selection.
     scoped_refptr<AppCache> cache(MakeNewCache());
     host_->pending_selected_cache_id_ = cache->cache_id();
+    host_->set_preferred_manifest_url(cache->owning_group()->manifest_url());
 
     request_.reset(new MockURLRequest(GURL("http://blah/")));
     handler_.reset(host_->CreateRequestHandler(request_.get(),
                                                ResourceType::SUB_RESOURCE));
     EXPECT_TRUE(handler_.get());
     job_ = handler_->MaybeLoadResource(request_.get());
     EXPECT_TRUE(job_.get());
     EXPECT_TRUE(job_->is_waiting());
 
     host_->FinishCacheSelection(cache, NULL);
@@ skipping 360 matching lines @@
 
 TEST_F(AppCacheRequestHandlerTest, WorkerRequest) {
   RunTestOnIOThread(&AppCacheRequestHandlerTest::WorkerRequest);
 }
 
 }  // namespace appcache
 
 // AppCacheRequestHandlerTest is expected to always live longer than the
 // runnable methods.  This lets us call NewRunnableMethod on its instances.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheRequestHandlerTest);