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

webkit/appcache/mock_appcache_storage_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 "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_response.h"
 #include "webkit/appcache/appcache_storage.h"
 #include "webkit/appcache/mock_appcache_service.h"
@@ skipping 375 matching lines @@
 TEST_F(MockAppCacheStorageTest, FindNoMainResponse) {
   // Should complete asyncly.
   MockAppCacheService service;
   MockAppCacheStorage* storage =
       reinterpret_cast<MockAppCacheStorage*>(service.storage());
 
   // Conduct the test.
   MockStorageDelegate delegate;
   GURL url("http://blah/some_url");
   EXPECT_NE(url, delegate.found_url_);
-  storage->FindResponseForMainRequest(url, &delegate);
+  storage->FindResponseForMainRequest(url, GURL(), &delegate);
   EXPECT_NE(url, delegate.found_url_);
   MessageLoop::current()->RunAllPending();  // 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_TRUE(delegate.found_fallback_url_.is_empty());
   EXPECT_EQ(0, delegate.found_entry_.types());
   EXPECT_EQ(0, delegate.found_fallback_entry_.types());
@@ skipping 16 matching lines @@
   cache->set_complete(true);
   scoped_refptr<AppCacheGroup> group(
       new AppCacheGroup(&service, kManifestUrl, 111));
   group->AddCache(cache);
   storage->AddStoredGroup(group);
   storage->AddStoredCache(cache);
 
   // Conduct the test.
   MockStorageDelegate delegate;
   EXPECT_NE(kEntryUrl, delegate.found_url_);
-  storage->FindResponseForMainRequest(kEntryUrl, &delegate);
+  storage->FindResponseForMainRequest(kEntryUrl, GURL(), &delegate);
   EXPECT_NE(kEntryUrl, delegate.found_url_);
   MessageLoop::current()->RunAllPending();  // Do async task execution.
   EXPECT_EQ(kEntryUrl, delegate.found_url_);
   EXPECT_EQ(kManifestUrl, delegate.found_manifest_url_);
   EXPECT_EQ(kCacheId, delegate.found_cache_id_);
   EXPECT_EQ(kResponseId, delegate.found_entry_.response_id());
   EXPECT_TRUE(delegate.found_entry_.IsExplicit());
   EXPECT_FALSE(delegate.found_fallback_entry_.has_response_id());
 }
 
@@ skipping 34 matching lines @@
   storage->AddStoredGroup(group);
   storage->AddStoredCache(cache);
 
   // The test url is in both fallback namespace urls, but should match
   // the longer of the two.
   const GURL kTestUrl("http://blah/fallback_namespace/longer/test");
 
   // Conduct the test.
   MockStorageDelegate delegate;
   EXPECT_NE(kTestUrl, delegate.found_url_);
-  storage->FindResponseForMainRequest(kTestUrl, &delegate);
+  storage->FindResponseForMainRequest(kTestUrl, GURL(), &delegate);
   EXPECT_NE(kTestUrl, delegate.found_url_);
   MessageLoop::current()->RunAllPending();  // Do async task execution.
   EXPECT_EQ(kTestUrl, delegate.found_url_);
   EXPECT_EQ(kManifestUrl, delegate.found_manifest_url_);
   EXPECT_EQ(kCacheId, delegate.found_cache_id_);
   EXPECT_FALSE(delegate.found_entry_.has_response_id());
   EXPECT_EQ(kResponseId2, delegate.found_fallback_entry_.response_id());
   EXPECT_EQ(kFallbackEntryUrl2, delegate.found_fallback_url_);
   EXPECT_TRUE(delegate.found_fallback_entry_.IsFallback());
 }
@@ skipping 36 matching lines @@
   cache->set_complete(true);
   group = new AppCacheGroup(&service, kManifestUrl2, 222);
   group->AddCache(cache);
   storage->AddStoredGroup(group);
   storage->AddStoredCache(cache);
 
   // Conduct the test, we should find the response from the second cache
   // since it's "in use".
   MockStorageDelegate delegate;
   EXPECT_NE(kEntryUrl, delegate.found_url_);
-  storage->FindResponseForMainRequest(kEntryUrl, &delegate);
+  storage->FindResponseForMainRequest(kEntryUrl, GURL(), &delegate);
   EXPECT_NE(kEntryUrl, delegate.found_url_);
   MessageLoop::current()->RunAllPending();  // Do async task execution.
   EXPECT_EQ(kEntryUrl, delegate.found_url_);
   EXPECT_EQ(kManifestUrl2, delegate.found_manifest_url_);
   EXPECT_EQ(kCacheId2, delegate.found_cache_id_);
   EXPECT_EQ(kResponseId2, delegate.found_entry_.response_id());
   EXPECT_TRUE(delegate.found_entry_.IsExplicit());
   EXPECT_FALSE(delegate.found_fallback_entry_.has_response_id());
 }
 
@@ skipping 25 matching lines @@
   scoped_refptr<AppCacheGroup> group(
       new AppCacheGroup(&service, kManifestUrl, 111));
   group->AddCache(cache);
   storage->AddStoredGroup(group);
   storage->AddStoredCache(cache);
 
   MockStorageDelegate delegate;
 
   // We should not find anything for the foreign entry.
   EXPECT_NE(kEntryUrl, delegate.found_url_);
-  storage->FindResponseForMainRequest(kEntryUrl, &delegate);
+  storage->FindResponseForMainRequest(kEntryUrl, GURL(), &delegate);
   EXPECT_NE(kEntryUrl, delegate.found_url_);
   MessageLoop::current()->RunAllPending();  // 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_TRUE(delegate.found_fallback_url_.is_empty());
   EXPECT_EQ(0, delegate.found_entry_.types());
   EXPECT_EQ(0, delegate.found_fallback_entry_.types());
 
   // We should not find anything for the online namespace.
   EXPECT_NE(kOnlineNamespaceUrl, delegate.found_url_);
-  storage->FindResponseForMainRequest(kOnlineNamespaceUrl, &delegate);
+  storage->FindResponseForMainRequest(kOnlineNamespaceUrl, GURL(), &delegate);
   EXPECT_NE(kOnlineNamespaceUrl, delegate.found_url_);
   MessageLoop::current()->RunAllPending();  // 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_TRUE(delegate.found_fallback_url_.is_empty());
   EXPECT_EQ(0, delegate.found_entry_.types());
   EXPECT_EQ(0, delegate.found_fallback_entry_.types());
 }
 
 }  // namespace appcache