Give the layout test harness better information to determine when to finish.

content/shell/renderer/test_runner/web_test_proxy.cc

 // Copyright 2014 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 "content/shell/renderer/test_runner/web_test_proxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ skipping 909 matching lines @@
         " - didReceiveServerRedirectForProvisionalLoadForFrame\n");
   }
 }
 
 bool WebTestProxyBase::DidFailProvisionalLoad(blink::WebLocalFrame* frame,
                                               const blink::WebURLError& error) {
   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFailProvisionalLoadWithError\n");
   }
-  LocationChangeDone(frame);
+  CheckDone(frame, MainResourceLoadFailed);
   return !frame->provisionalDataSource();
 }
 
 void WebTestProxyBase::DidCommitProvisionalLoad(
     blink::WebLocalFrame* frame,
     const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType history_type) {
   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didCommitLoadForFrame\n");
@@ skipping 44 matching lines @@
     delegate_->printMessage(" - didHandleOnloadEventsForFrame\n");
   }
 }
 
 void WebTestProxyBase::DidFailLoad(blink::WebLocalFrame* frame,
                                    const blink::WebURLError& error) {
   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFailLoadWithError\n");
   }
-  LocationChangeDone(frame);
+  CheckDone(frame, MainResourceLoadFailed);
 }
 
 void WebTestProxyBase::DidFinishLoad(blink::WebLocalFrame* frame) {
   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFinishLoadForFrame\n");
   }
-  LocationChangeDone(frame);
+  CheckDone(frame, LoadFinished);
 }
 
 void WebTestProxyBase::DidDetectXSS(blink::WebLocalFrame* frame,
                                     const blink::WebURL& insecure_url,
                                     bool did_block_entire_page) {
   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks())
     delegate_->printMessage("didDetectXSS\n");
 }
 
 void WebTestProxyBase::DidDispatchPingLoader(blink::WebLocalFrame* frame,
@@ skipping 139 matching lines @@
                                              unsigned identifier) {
   if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) {
     if (resource_identifier_map_.find(identifier) ==
         resource_identifier_map_.end())
       delegate_->printMessage("<unknown>");
     else
       delegate_->printMessage(resource_identifier_map_[identifier]);
     delegate_->printMessage(" - didFinishLoading\n");
   }
   resource_identifier_map_.erase(identifier);
+#if !defined(ENABLE_LOAD_COMPLETION_HACKS)
+  CheckDone(frame, ResourceLoadCompleted);
+#endif
 }
 
 void WebTestProxyBase::DidAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line) {
   // This matches win DumpRenderTree's UIDelegate.cpp.
   if (!log_console_output_)
     return;
   std::string level;
@@ skipping 24 matching lines @@
     size_t file_protocol = new_message.find("file://");
     if (file_protocol != std::string::npos) {
       new_message = new_message.substr(0, file_protocol) +
                     URLSuitableForTestResult(new_message.substr(file_protocol));
     }
     delegate_->printMessage(new_message);
   }
   delegate_->printMessage(std::string("\n"));
 }
 
-void WebTestProxyBase::LocationChangeDone(blink::WebFrame* frame) {
+void WebTestProxyBase::CheckDone(blink::WebLocalFrame* frame,
+                                 CheckDoneReason reason) {
   if (frame != test_interfaces_->GetTestRunner()->topLoadingFrame())
     return;
+
+#if !defined(ENABLE_LOAD_COMPLETION_HACKS)
+  // Quirk for MHTML prematurely completing on resource load completion.
+  std::string mime_type = frame->dataSource()->response().mimeType().utf8();
+  if (reason == ResourceLoadCompleted && mime_type == "multipart/related")
+    return;
+
+  if (reason != MainResourceLoadFailed &&
+      (frame->isResourceLoadInProgress() || frame->isLoading()))
+    return;
+#endif
   test_interfaces_->GetTestRunner()->setTopLoadingFrame(frame, true);
 }
 
 blink::WebNavigationPolicy WebTestProxyBase::DecidePolicyForNavigation(
     const blink::WebFrameClient::NavigationPolicyInfo& info) {
   blink::WebNavigationPolicy result;
   if (!test_interfaces_->GetTestRunner()->policyDelegateEnabled())
     return info.defaultPolicy;
 
   delegate_->printMessage(std::string("Policy delegate: attempt to load ") +
@@ skipping 45 matching lines @@
   if (!push_client_.get())
     push_client_.reset(new MockWebPushClient);
   return push_client_.get();
 }
 
 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() {
   return GetPushClientMock();
 }
 
 }  // namespace content