Move most of FrameLoader::CheckCompleted() to Document

third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 619 matching lines @@
   // checking code correctness and consistency.
   document->Loader()->SetLoadType(kFrameLoadTypeReload);
   child_frame->Loader().GetDocumentLoader()->SetLoadType(
       kFrameLoadTypeReloadBypassingCache);
   EXPECT_EQ(WebCachePolicy::kBypassingCache,
             child_fetch_context->ResourceRequestCachePolicy(
                 request, Resource::kMainResource, FetchRequest::kNoDefer));
 }
 
 TEST_F(FrameFetchContextTest, SubResourceCachePolicy) {
+  // Reset load event state: if the load event is finished, we ignore the
+  // DocumentLoader load type.
+  document->open();

[Nate Chapin, 2017/04/11 23:25:50]

This is needed because Document::CancelParsing() now calls SuppressLoadEvent(),
which causes Document::LoadEventFinished() to return true.

+  ASSERT_FALSE(document->LoadEventFinished());
+
   // Default case
   ResourceRequest request("http://www.example.com/mock");
   EXPECT_EQ(WebCachePolicy::kUseProtocolCachePolicy,
             fetch_context->ResourceRequestCachePolicy(request, Resource::kMock,
                                                       FetchRequest::kNoDefer));
 
   // FrameLoadTypeReload should not affect sub-resources
   document->Loader()->SetLoadType(kFrameLoadTypeReload);
   EXPECT_EQ(WebCachePolicy::kUseProtocolCachePolicy,
             fetch_context->ResourceRequestCachePolicy(request, Resource::kMock,
@@ skipping 373 matching lines @@
   SetFilterPolicy(WebDocumentSubresourceFilter::kWouldDisallow);
 
   EXPECT_EQ(ResourceRequestBlockedReason::kNone, CanRequest());
   EXPECT_EQ(0, GetFilteredLoadCallCount());
 
   EXPECT_EQ(ResourceRequestBlockedReason::kNone, CanRequestPreload());
   EXPECT_EQ(0, GetFilteredLoadCallCount());
 }
 
 }  // namespace blink