| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include <stack> | 5 #include <stack> | 
| 6 #include <string> | 6 #include <string> | 
| 7 #include <vector> | 7 #include <vector> | 
| 8 | 8 | 
| 9 #include "base/bind.h" | 9 #include "base/bind.h" | 
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" | 
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 247   } | 247   } | 
| 248 | 248 | 
| 249   // MainResource_Miss -------------------------------------------------- | 249   // MainResource_Miss -------------------------------------------------- | 
| 250 | 250 | 
| 251   void MainResource_Miss() { | 251   void MainResource_Miss() { | 
| 252     PushNextTask( | 252     PushNextTask( | 
| 253         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Miss, | 253         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Miss, | 
| 254                    base::Unretained(this))); | 254                    base::Unretained(this))); | 
| 255 | 255 | 
| 256     request_ = empty_context_.CreateRequest( | 256     request_ = empty_context_.CreateRequest( | 
| 257         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 257         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 258     handler_.reset(host_->CreateRequestHandler(request_.get(), | 258     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 259                                                RESOURCE_TYPE_MAIN_FRAME, | 259                                                RESOURCE_TYPE_MAIN_FRAME, | 
| 260                                                false)); | 260                                                false)); | 
| 261     EXPECT_TRUE(handler_.get()); | 261     EXPECT_TRUE(handler_.get()); | 
| 262 | 262 | 
| 263     job_ = handler_->MaybeLoadResource(request_.get(), | 263     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 264                                        request_->context()->network_delegate()); | 264                                        request_->context()->network_delegate()); | 
| 265     EXPECT_TRUE(job_.get()); | 265     EXPECT_TRUE(job_.get()); | 
| 266     EXPECT_TRUE(job_->is_waiting()); | 266     EXPECT_TRUE(job_->is_waiting()); | 
| 267 | 267 | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 296   } | 296   } | 
| 297 | 297 | 
| 298   // MainResource_Hit -------------------------------------------------- | 298   // MainResource_Hit -------------------------------------------------- | 
| 299 | 299 | 
| 300   void MainResource_Hit() { | 300   void MainResource_Hit() { | 
| 301     PushNextTask( | 301     PushNextTask( | 
| 302         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Hit, | 302         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Hit, | 
| 303                    base::Unretained(this))); | 303                    base::Unretained(this))); | 
| 304 | 304 | 
| 305     request_ = empty_context_.CreateRequest( | 305     request_ = empty_context_.CreateRequest( | 
| 306         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 306         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 307     handler_.reset(host_->CreateRequestHandler(request_.get(), | 307     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 308                                                RESOURCE_TYPE_MAIN_FRAME, | 308                                                RESOURCE_TYPE_MAIN_FRAME, | 
| 309                                                false)); | 309                                                false)); | 
| 310     EXPECT_TRUE(handler_.get()); | 310     EXPECT_TRUE(handler_.get()); | 
| 311 | 311 | 
| 312     mock_storage()->SimulateFindMainResource( | 312     mock_storage()->SimulateFindMainResource( | 
| 313         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 313         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 
| 314         GURL(), AppCacheEntry(), | 314         GURL(), AppCacheEntry(), | 
| 315         1, 2, GURL("http://blah/manifest/")); | 315         1, 2, GURL("http://blah/manifest/")); | 
| 316 | 316 | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 346   } | 346   } | 
| 347 | 347 | 
| 348   // MainResource_Fallback -------------------------------------------------- | 348   // MainResource_Fallback -------------------------------------------------- | 
| 349 | 349 | 
| 350   void MainResource_Fallback() { | 350   void MainResource_Fallback() { | 
| 351     PushNextTask( | 351     PushNextTask( | 
| 352         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Fallback, | 352         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Fallback, | 
| 353                    base::Unretained(this))); | 353                    base::Unretained(this))); | 
| 354 | 354 | 
| 355     request_ = empty_context_.CreateRequest( | 355     request_ = empty_context_.CreateRequest( | 
| 356         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 356         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 357     handler_.reset(host_->CreateRequestHandler(request_.get(), | 357     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 358                                                RESOURCE_TYPE_MAIN_FRAME, | 358                                                RESOURCE_TYPE_MAIN_FRAME, | 
| 359                                                false)); | 359                                                false)); | 
| 360     EXPECT_TRUE(handler_.get()); | 360     EXPECT_TRUE(handler_.get()); | 
| 361 | 361 | 
| 362     mock_storage()->SimulateFindMainResource( | 362     mock_storage()->SimulateFindMainResource( | 
| 363         AppCacheEntry(), | 363         AppCacheEntry(), | 
| 364         GURL("http://blah/fallbackurl"), | 364         GURL("http://blah/fallbackurl"), | 
| 365         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 365         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 
| 366         1, 2, GURL("http://blah/manifest/")); | 366         1, 2, GURL("http://blah/manifest/")); | 
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 429 | 429 | 
| 430   // MainResource_FallbackOverride -------------------------------------------- | 430   // MainResource_FallbackOverride -------------------------------------------- | 
| 431 | 431 | 
| 432   void MainResource_FallbackOverride() { | 432   void MainResource_FallbackOverride() { | 
| 433     PushNextTask(base::Bind( | 433     PushNextTask(base::Bind( | 
| 434         &AppCacheRequestHandlerTest::Verify_MainResource_FallbackOverride, | 434         &AppCacheRequestHandlerTest::Verify_MainResource_FallbackOverride, | 
| 435         base::Unretained(this))); | 435         base::Unretained(this))); | 
| 436 | 436 | 
| 437     request_ = empty_context_.CreateRequest( | 437     request_ = empty_context_.CreateRequest( | 
| 438         GURL("http://blah/fallback-override"), net::DEFAULT_PRIORITY, | 438         GURL("http://blah/fallback-override"), net::DEFAULT_PRIORITY, | 
| 439         &delegate_, NULL); | 439         &delegate_); | 
| 440     handler_.reset(host_->CreateRequestHandler(request_.get(), | 440     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 441                                                RESOURCE_TYPE_MAIN_FRAME, | 441                                                RESOURCE_TYPE_MAIN_FRAME, | 
| 442                                                false)); | 442                                                false)); | 
| 443     EXPECT_TRUE(handler_.get()); | 443     EXPECT_TRUE(handler_.get()); | 
| 444 | 444 | 
| 445     mock_storage()->SimulateFindMainResource( | 445     mock_storage()->SimulateFindMainResource( | 
| 446         AppCacheEntry(), | 446         AppCacheEntry(), | 
| 447         GURL("http://blah/fallbackurl"), | 447         GURL("http://blah/fallbackurl"), | 
| 448         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 448         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 
| 449         1, 2, GURL("http://blah/manifest/")); | 449         1, 2, GURL("http://blah/manifest/")); | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 483         request_.get(), request_->context()->network_delegate()); | 483         request_.get(), request_->context()->network_delegate()); | 
| 484     EXPECT_FALSE(job_.get()); | 484     EXPECT_FALSE(job_.get()); | 
| 485 | 485 | 
| 486     TestFinished(); | 486     TestFinished(); | 
| 487   } | 487   } | 
| 488 | 488 | 
| 489   // SubResource_Miss_WithNoCacheSelected ---------------------------------- | 489   // SubResource_Miss_WithNoCacheSelected ---------------------------------- | 
| 490 | 490 | 
| 491   void SubResource_Miss_WithNoCacheSelected() { | 491   void SubResource_Miss_WithNoCacheSelected() { | 
| 492     request_ = empty_context_.CreateRequest( | 492     request_ = empty_context_.CreateRequest( | 
| 493         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 493         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 494     handler_.reset(host_->CreateRequestHandler(request_.get(), | 494     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 495                                                RESOURCE_TYPE_SUB_RESOURCE, | 495                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 496                                                false)); | 496                                                false)); | 
| 497 | 497 | 
| 498     // We avoid creating handler when possible, sub-resource requests are not | 498     // We avoid creating handler when possible, sub-resource requests are not | 
| 499     // subject to retrieval from an appcache when there's no associated cache. | 499     // subject to retrieval from an appcache when there's no associated cache. | 
| 500     EXPECT_FALSE(handler_.get()); | 500     EXPECT_FALSE(handler_.get()); | 
| 501 | 501 | 
| 502     TestFinished(); | 502     TestFinished(); | 
| 503   } | 503   } | 
| 504 | 504 | 
| 505   // SubResource_Miss_WithCacheSelected ---------------------------------- | 505   // SubResource_Miss_WithCacheSelected ---------------------------------- | 
| 506 | 506 | 
| 507   void SubResource_Miss_WithCacheSelected() { | 507   void SubResource_Miss_WithCacheSelected() { | 
| 508     // A sub-resource load where the resource is not in an appcache, or | 508     // A sub-resource load where the resource is not in an appcache, or | 
| 509     // in a network or fallback namespace, should result in a failed request. | 509     // in a network or fallback namespace, should result in a failed request. | 
| 510     host_->AssociateCompleteCache(MakeNewCache()); | 510     host_->AssociateCompleteCache(MakeNewCache()); | 
| 511 | 511 | 
| 512     request_ = empty_context_.CreateRequest( | 512     request_ = empty_context_.CreateRequest( | 
| 513         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 513         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 514     handler_.reset(host_->CreateRequestHandler(request_.get(), | 514     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 515                                                RESOURCE_TYPE_SUB_RESOURCE, | 515                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 516                                                false)); | 516                                                false)); | 
| 517     EXPECT_TRUE(handler_.get()); | 517     EXPECT_TRUE(handler_.get()); | 
| 518 | 518 | 
| 519     job_ = handler_->MaybeLoadResource(request_.get(), | 519     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 520                                        request_->context()->network_delegate()); | 520                                        request_->context()->network_delegate()); | 
| 521     EXPECT_TRUE(job_.get()); | 521     EXPECT_TRUE(job_.get()); | 
| 522     EXPECT_TRUE(job_->is_delivering_error_response()); | 522     EXPECT_TRUE(job_->is_delivering_error_response()); | 
| 523 | 523 | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 536 | 536 | 
| 537   // SubResource_Miss_WithWaitForCacheSelection ----------------------------- | 537   // SubResource_Miss_WithWaitForCacheSelection ----------------------------- | 
| 538 | 538 | 
| 539   void SubResource_Miss_WithWaitForCacheSelection() { | 539   void SubResource_Miss_WithWaitForCacheSelection() { | 
| 540     // Precondition, the host is waiting on cache selection. | 540     // Precondition, the host is waiting on cache selection. | 
| 541     scoped_refptr<AppCache> cache(MakeNewCache()); | 541     scoped_refptr<AppCache> cache(MakeNewCache()); | 
| 542     host_->pending_selected_cache_id_ = cache->cache_id(); | 542     host_->pending_selected_cache_id_ = cache->cache_id(); | 
| 543     host_->set_preferred_manifest_url(cache->owning_group()->manifest_url()); | 543     host_->set_preferred_manifest_url(cache->owning_group()->manifest_url()); | 
| 544 | 544 | 
| 545     request_ = empty_context_.CreateRequest( | 545     request_ = empty_context_.CreateRequest( | 
| 546         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 546         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 547     handler_.reset(host_->CreateRequestHandler(request_.get(), | 547     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 548                                                RESOURCE_TYPE_SUB_RESOURCE, | 548                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 549                                                false)); | 549                                                false)); | 
| 550     EXPECT_TRUE(handler_.get()); | 550     EXPECT_TRUE(handler_.get()); | 
| 551     job_ = handler_->MaybeLoadResource(request_.get(), | 551     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 552                                        request_->context()->network_delegate()); | 552                                        request_->context()->network_delegate()); | 
| 553     EXPECT_TRUE(job_.get()); | 553     EXPECT_TRUE(job_.get()); | 
| 554     EXPECT_TRUE(job_->is_waiting()); | 554     EXPECT_TRUE(job_->is_waiting()); | 
| 555 | 555 | 
| 556     host_->FinishCacheSelection(cache.get(), NULL); | 556     host_->FinishCacheSelection(cache.get(), NULL); | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 572 | 572 | 
| 573   // SubResource_Hit ----------------------------- | 573   // SubResource_Hit ----------------------------- | 
| 574 | 574 | 
| 575   void SubResource_Hit() { | 575   void SubResource_Hit() { | 
| 576     host_->AssociateCompleteCache(MakeNewCache()); | 576     host_->AssociateCompleteCache(MakeNewCache()); | 
| 577 | 577 | 
| 578     mock_storage()->SimulateFindSubResource( | 578     mock_storage()->SimulateFindSubResource( | 
| 579         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false); | 579         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false); | 
| 580 | 580 | 
| 581     request_ = empty_context_.CreateRequest( | 581     request_ = empty_context_.CreateRequest( | 
| 582         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 582         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 583     handler_.reset(host_->CreateRequestHandler(request_.get(), | 583     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 584                                                RESOURCE_TYPE_SUB_RESOURCE, | 584                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 585                                                false)); | 585                                                false)); | 
| 586     EXPECT_TRUE(handler_.get()); | 586     EXPECT_TRUE(handler_.get()); | 
| 587     job_ = handler_->MaybeLoadResource(request_.get(), | 587     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 588                                        request_->context()->network_delegate()); | 588                                        request_->context()->network_delegate()); | 
| 589     EXPECT_TRUE(job_.get()); | 589     EXPECT_TRUE(job_.get()); | 
| 590     EXPECT_TRUE(job_->is_delivering_appcache_response()); | 590     EXPECT_TRUE(job_->is_delivering_appcache_response()); | 
| 591 | 591 | 
| 592     AppCacheURLRequestJob* fallback_job; | 592     AppCacheURLRequestJob* fallback_job; | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 606 | 606 | 
| 607   void SubResource_RedirectFallback() { | 607   void SubResource_RedirectFallback() { | 
| 608     // Redirects to resources in the a different origin are subject to | 608     // Redirects to resources in the a different origin are subject to | 
| 609     // fallback namespaces. | 609     // fallback namespaces. | 
| 610     host_->AssociateCompleteCache(MakeNewCache()); | 610     host_->AssociateCompleteCache(MakeNewCache()); | 
| 611 | 611 | 
| 612     mock_storage()->SimulateFindSubResource( | 612     mock_storage()->SimulateFindSubResource( | 
| 613         AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false); | 613         AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false); | 
| 614 | 614 | 
| 615     request_ = empty_context_.CreateRequest( | 615     request_ = empty_context_.CreateRequest( | 
| 616         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 616         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 617     handler_.reset(host_->CreateRequestHandler(request_.get(), | 617     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 618                                                RESOURCE_TYPE_SUB_RESOURCE, | 618                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 619                                                false)); | 619                                                false)); | 
| 620     EXPECT_TRUE(handler_.get()); | 620     EXPECT_TRUE(handler_.get()); | 
| 621     job_ = handler_->MaybeLoadResource(request_.get(), | 621     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 622                                        request_->context()->network_delegate()); | 622                                        request_->context()->network_delegate()); | 
| 623     EXPECT_FALSE(job_.get()); | 623     EXPECT_FALSE(job_.get()); | 
| 624 | 624 | 
| 625     job_ = handler_->MaybeLoadFallbackForRedirect( | 625     job_ = handler_->MaybeLoadFallbackForRedirect( | 
| 626         request_.get(), | 626         request_.get(), | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 641 | 641 | 
| 642   void SubResource_NoRedirectFallback() { | 642   void SubResource_NoRedirectFallback() { | 
| 643     // Redirects to resources in the same-origin are not subject to | 643     // Redirects to resources in the same-origin are not subject to | 
| 644     // fallback namespaces. | 644     // fallback namespaces. | 
| 645     host_->AssociateCompleteCache(MakeNewCache()); | 645     host_->AssociateCompleteCache(MakeNewCache()); | 
| 646 | 646 | 
| 647     mock_storage()->SimulateFindSubResource( | 647     mock_storage()->SimulateFindSubResource( | 
| 648         AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false); | 648         AppCacheEntry(), AppCacheEntry(AppCacheEntry::EXPLICIT, 1), false); | 
| 649 | 649 | 
| 650     request_ = empty_context_.CreateRequest( | 650     request_ = empty_context_.CreateRequest( | 
| 651         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 651         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 652     handler_.reset(host_->CreateRequestHandler(request_.get(), | 652     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 653                                                RESOURCE_TYPE_SUB_RESOURCE, | 653                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 654                                                false)); | 654                                                false)); | 
| 655     EXPECT_TRUE(handler_.get()); | 655     EXPECT_TRUE(handler_.get()); | 
| 656     job_ = handler_->MaybeLoadResource(request_.get(), | 656     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 657                                        request_->context()->network_delegate()); | 657                                        request_->context()->network_delegate()); | 
| 658     EXPECT_FALSE(job_.get()); | 658     EXPECT_FALSE(job_.get()); | 
| 659 | 659 | 
| 660     AppCacheURLRequestJob* fallback_job; | 660     AppCacheURLRequestJob* fallback_job; | 
| 661     fallback_job = handler_->MaybeLoadFallbackForRedirect( | 661     fallback_job = handler_->MaybeLoadFallbackForRedirect( | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 677   void SubResource_Network() { | 677   void SubResource_Network() { | 
| 678     // A sub-resource load where the resource is in a network namespace, | 678     // A sub-resource load where the resource is in a network namespace, | 
| 679     // should result in the system using a 'real' job to do the network | 679     // should result in the system using a 'real' job to do the network | 
| 680     // retrieval. | 680     // retrieval. | 
| 681     host_->AssociateCompleteCache(MakeNewCache()); | 681     host_->AssociateCompleteCache(MakeNewCache()); | 
| 682 | 682 | 
| 683     mock_storage()->SimulateFindSubResource( | 683     mock_storage()->SimulateFindSubResource( | 
| 684         AppCacheEntry(), AppCacheEntry(), true); | 684         AppCacheEntry(), AppCacheEntry(), true); | 
| 685 | 685 | 
| 686     request_ = empty_context_.CreateRequest( | 686     request_ = empty_context_.CreateRequest( | 
| 687         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 687         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 688     handler_.reset(host_->CreateRequestHandler(request_.get(), | 688     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 689                                                RESOURCE_TYPE_SUB_RESOURCE, | 689                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 690                                                false)); | 690                                                false)); | 
| 691     EXPECT_TRUE(handler_.get()); | 691     EXPECT_TRUE(handler_.get()); | 
| 692     job_ = handler_->MaybeLoadResource(request_.get(), | 692     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 693                                        request_->context()->network_delegate()); | 693                                        request_->context()->network_delegate()); | 
| 694     EXPECT_FALSE(job_.get()); | 694     EXPECT_FALSE(job_.get()); | 
| 695 | 695 | 
| 696     AppCacheURLRequestJob* fallback_job; | 696     AppCacheURLRequestJob* fallback_job; | 
| 697     fallback_job = handler_->MaybeLoadFallbackForRedirect( | 697     fallback_job = handler_->MaybeLoadFallbackForRedirect( | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 708 | 708 | 
| 709   // DestroyedHost ----------------------------- | 709   // DestroyedHost ----------------------------- | 
| 710 | 710 | 
| 711   void DestroyedHost() { | 711   void DestroyedHost() { | 
| 712     host_->AssociateCompleteCache(MakeNewCache()); | 712     host_->AssociateCompleteCache(MakeNewCache()); | 
| 713 | 713 | 
| 714     mock_storage()->SimulateFindSubResource( | 714     mock_storage()->SimulateFindSubResource( | 
| 715         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false); | 715         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), AppCacheEntry(), false); | 
| 716 | 716 | 
| 717     request_ = empty_context_.CreateRequest( | 717     request_ = empty_context_.CreateRequest( | 
| 718         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 718         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 719     handler_.reset(host_->CreateRequestHandler(request_.get(), | 719     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 720                                                RESOURCE_TYPE_SUB_RESOURCE, | 720                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 721                                                false)); | 721                                                false)); | 
| 722     EXPECT_TRUE(handler_.get()); | 722     EXPECT_TRUE(handler_.get()); | 
| 723 | 723 | 
| 724     backend_impl_->UnregisterHost(1); | 724     backend_impl_->UnregisterHost(1); | 
| 725     host_ = NULL; | 725     host_ = NULL; | 
| 726 | 726 | 
| 727     EXPECT_FALSE(handler_->MaybeLoadResource( | 727     EXPECT_FALSE(handler_->MaybeLoadResource( | 
| 728         request_.get(), request_->context()->network_delegate())); | 728         request_.get(), request_->context()->network_delegate())); | 
| 729     EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( | 729     EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( | 
| 730         request_.get(), | 730         request_.get(), | 
| 731         request_->context()->network_delegate(), | 731         request_->context()->network_delegate(), | 
| 732         GURL("http://blah/redirect"))); | 732         GURL("http://blah/redirect"))); | 
| 733     EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( | 733     EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( | 
| 734         request_.get(), request_->context()->network_delegate())); | 734         request_.get(), request_->context()->network_delegate())); | 
| 735 | 735 | 
| 736     TestFinished(); | 736     TestFinished(); | 
| 737   } | 737   } | 
| 738 | 738 | 
| 739   // DestroyedHostWithWaitingJob ----------------------------- | 739   // DestroyedHostWithWaitingJob ----------------------------- | 
| 740 | 740 | 
| 741   void DestroyedHostWithWaitingJob() { | 741   void DestroyedHostWithWaitingJob() { | 
| 742     // Precondition, the host is waiting on cache selection. | 742     // Precondition, the host is waiting on cache selection. | 
| 743     host_->pending_selected_cache_id_ = 1; | 743     host_->pending_selected_cache_id_ = 1; | 
| 744 | 744 | 
| 745     request_ = empty_context_.CreateRequest( | 745     request_ = empty_context_.CreateRequest( | 
| 746         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 746         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 747     handler_.reset(host_->CreateRequestHandler(request_.get(), | 747     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 748                                                RESOURCE_TYPE_SUB_RESOURCE, | 748                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 749                                                false)); | 749                                                false)); | 
| 750     EXPECT_TRUE(handler_.get()); | 750     EXPECT_TRUE(handler_.get()); | 
| 751 | 751 | 
| 752     job_ = handler_->MaybeLoadResource(request_.get(), | 752     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 753                                        request_->context()->network_delegate()); | 753                                        request_->context()->network_delegate()); | 
| 754     EXPECT_TRUE(job_.get()); | 754     EXPECT_TRUE(job_.get()); | 
| 755     EXPECT_TRUE(job_->is_waiting()); | 755     EXPECT_TRUE(job_->is_waiting()); | 
| 756 | 756 | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 770     TestFinished(); | 770     TestFinished(); | 
| 771   } | 771   } | 
| 772 | 772 | 
| 773   // UnsupportedScheme ----------------------------- | 773   // UnsupportedScheme ----------------------------- | 
| 774 | 774 | 
| 775   void UnsupportedScheme() { | 775   void UnsupportedScheme() { | 
| 776     // Precondition, the host is waiting on cache selection. | 776     // Precondition, the host is waiting on cache selection. | 
| 777     host_->pending_selected_cache_id_ = 1; | 777     host_->pending_selected_cache_id_ = 1; | 
| 778 | 778 | 
| 779     request_ = empty_context_.CreateRequest( | 779     request_ = empty_context_.CreateRequest( | 
| 780         GURL("ftp://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 780         GURL("ftp://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 781     handler_.reset(host_->CreateRequestHandler(request_.get(), | 781     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 782                                                RESOURCE_TYPE_SUB_RESOURCE, | 782                                                RESOURCE_TYPE_SUB_RESOURCE, | 
| 783                                                false)); | 783                                                false)); | 
| 784     EXPECT_TRUE(handler_.get());  // we could redirect to http (conceivably) | 784     EXPECT_TRUE(handler_.get());  // we could redirect to http (conceivably) | 
| 785 | 785 | 
| 786     EXPECT_FALSE(handler_->MaybeLoadResource( | 786     EXPECT_FALSE(handler_->MaybeLoadResource( | 
| 787         request_.get(), request_->context()->network_delegate())); | 787         request_.get(), request_->context()->network_delegate())); | 
| 788     EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( | 788     EXPECT_FALSE(handler_->MaybeLoadFallbackForRedirect( | 
| 789         request_.get(), | 789         request_.get(), | 
| 790         request_->context()->network_delegate(), | 790         request_->context()->network_delegate(), | 
| 791         GURL("ftp://blah/redirect"))); | 791         GURL("ftp://blah/redirect"))); | 
| 792     EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( | 792     EXPECT_FALSE(handler_->MaybeLoadFallbackForResponse( | 
| 793         request_.get(), request_->context()->network_delegate())); | 793         request_.get(), request_->context()->network_delegate())); | 
| 794 | 794 | 
| 795     TestFinished(); | 795     TestFinished(); | 
| 796   } | 796   } | 
| 797 | 797 | 
| 798   // CanceledRequest ----------------------------- | 798   // CanceledRequest ----------------------------- | 
| 799 | 799 | 
| 800   void CanceledRequest() { | 800   void CanceledRequest() { | 
| 801     request_ = empty_context_.CreateRequest( | 801     request_ = empty_context_.CreateRequest( | 
| 802         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 802         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 803     handler_.reset(host_->CreateRequestHandler(request_.get(), | 803     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 804                                                RESOURCE_TYPE_MAIN_FRAME, | 804                                                RESOURCE_TYPE_MAIN_FRAME, | 
| 805                                                false)); | 805                                                false)); | 
| 806     EXPECT_TRUE(handler_.get()); | 806     EXPECT_TRUE(handler_.get()); | 
| 807 | 807 | 
| 808     job_ = handler_->MaybeLoadResource(request_.get(), | 808     job_ = handler_->MaybeLoadResource(request_.get(), | 
| 809                                        request_->context()->network_delegate()); | 809                                        request_->context()->network_delegate()); | 
| 810     EXPECT_TRUE(job_.get()); | 810     EXPECT_TRUE(job_.get()); | 
| 811     EXPECT_TRUE(job_->is_waiting()); | 811     EXPECT_TRUE(job_->is_waiting()); | 
| 812     EXPECT_FALSE(job_->has_been_started()); | 812     EXPECT_FALSE(job_->has_been_started()); | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 830     EXPECT_TRUE(AppCacheRequestHandler::IsMainResourceType( | 830     EXPECT_TRUE(AppCacheRequestHandler::IsMainResourceType( | 
| 831         RESOURCE_TYPE_MAIN_FRAME)); | 831         RESOURCE_TYPE_MAIN_FRAME)); | 
| 832     EXPECT_TRUE(AppCacheRequestHandler::IsMainResourceType( | 832     EXPECT_TRUE(AppCacheRequestHandler::IsMainResourceType( | 
| 833         RESOURCE_TYPE_SUB_FRAME)); | 833         RESOURCE_TYPE_SUB_FRAME)); | 
| 834     EXPECT_TRUE(AppCacheRequestHandler::IsMainResourceType( | 834     EXPECT_TRUE(AppCacheRequestHandler::IsMainResourceType( | 
| 835         RESOURCE_TYPE_SHARED_WORKER)); | 835         RESOURCE_TYPE_SHARED_WORKER)); | 
| 836     EXPECT_FALSE(AppCacheRequestHandler::IsMainResourceType( | 836     EXPECT_FALSE(AppCacheRequestHandler::IsMainResourceType( | 
| 837         RESOURCE_TYPE_WORKER)); | 837         RESOURCE_TYPE_WORKER)); | 
| 838 | 838 | 
| 839     request_ = empty_context_.CreateRequest( | 839     request_ = empty_context_.CreateRequest( | 
| 840         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 840         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 841 | 841 | 
| 842     const int kParentHostId = host_->host_id(); | 842     const int kParentHostId = host_->host_id(); | 
| 843     const int kWorkerHostId = 2; | 843     const int kWorkerHostId = 2; | 
| 844     const int kAbandonedWorkerHostId = 3; | 844     const int kAbandonedWorkerHostId = 3; | 
| 845     const int kNonExsitingHostId = 700; | 845     const int kNonExsitingHostId = 700; | 
| 846 | 846 | 
| 847     backend_impl_->RegisterHost(kWorkerHostId); | 847     backend_impl_->RegisterHost(kWorkerHostId); | 
| 848     AppCacheHost* worker_host = backend_impl_->GetHost(kWorkerHostId); | 848     AppCacheHost* worker_host = backend_impl_->GetHost(kWorkerHostId); | 
| 849     worker_host->SelectCacheForWorker(kParentHostId, kMockProcessId); | 849     worker_host->SelectCacheForWorker(kParentHostId, kMockProcessId); | 
| 850     handler_.reset(worker_host->CreateRequestHandler( | 850     handler_.reset(worker_host->CreateRequestHandler( | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
| 868   } | 868   } | 
| 869 | 869 | 
| 870   // MainResource_Blocked -------------------------------------------------- | 870   // MainResource_Blocked -------------------------------------------------- | 
| 871 | 871 | 
| 872   void MainResource_Blocked() { | 872   void MainResource_Blocked() { | 
| 873     PushNextTask( | 873     PushNextTask( | 
| 874         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Blocked, | 874         base::Bind(&AppCacheRequestHandlerTest::Verify_MainResource_Blocked, | 
| 875                    base::Unretained(this))); | 875                    base::Unretained(this))); | 
| 876 | 876 | 
| 877     request_ = empty_context_.CreateRequest( | 877     request_ = empty_context_.CreateRequest( | 
| 878         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_, NULL); | 878         GURL("http://blah/"), net::DEFAULT_PRIORITY, &delegate_); | 
| 879     handler_.reset(host_->CreateRequestHandler(request_.get(), | 879     handler_.reset(host_->CreateRequestHandler(request_.get(), | 
| 880                                                RESOURCE_TYPE_MAIN_FRAME, | 880                                                RESOURCE_TYPE_MAIN_FRAME, | 
| 881                                                false)); | 881                                                false)); | 
| 882     EXPECT_TRUE(handler_.get()); | 882     EXPECT_TRUE(handler_.get()); | 
| 883 | 883 | 
| 884     mock_policy_->can_load_return_value_ = false; | 884     mock_policy_->can_load_return_value_ = false; | 
| 885     mock_storage()->SimulateFindMainResource( | 885     mock_storage()->SimulateFindMainResource( | 
| 886         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 886         AppCacheEntry(AppCacheEntry::EXPLICIT, 1), | 
| 887         GURL(), AppCacheEntry(), | 887         GURL(), AppCacheEntry(), | 
| 888         1, 2, GURL("http://blah/manifest/")); | 888         1, 2, GURL("http://blah/manifest/")); | 
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1017 | 1017 | 
| 1018 TEST_F(AppCacheRequestHandlerTest, WorkerRequest) { | 1018 TEST_F(AppCacheRequestHandlerTest, WorkerRequest) { | 
| 1019   RunTestOnIOThread(&AppCacheRequestHandlerTest::WorkerRequest); | 1019   RunTestOnIOThread(&AppCacheRequestHandlerTest::WorkerRequest); | 
| 1020 } | 1020 } | 
| 1021 | 1021 | 
| 1022 TEST_F(AppCacheRequestHandlerTest, MainResource_Blocked) { | 1022 TEST_F(AppCacheRequestHandlerTest, MainResource_Blocked) { | 
| 1023   RunTestOnIOThread(&AppCacheRequestHandlerTest::MainResource_Blocked); | 1023   RunTestOnIOThread(&AppCacheRequestHandlerTest::MainResource_Blocked); | 
| 1024 } | 1024 } | 
| 1025 | 1025 | 
| 1026 }  // namespace content | 1026 }  // namespace content | 
| OLD | NEW | 
|---|