Disable load completion hacks flag, remove usages of the flag in chromium

content/shell/renderer/test_runner/web_test_proxy.cc

Index: content/shell/renderer/test_runner/web_test_proxy.cc
diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
index e39fd86a9ab04881f15814b467e35f6bdf64ddd5..a04adbdd5bac49ac10ea39abf21b0e72f6e62896 100644
--- a/content/shell/renderer/test_runner/web_test_proxy.cc
+++ b/content/shell/renderer/test_runner/web_test_proxy.cc
@@ -1214,9 +1214,7 @@ void WebTestProxyBase::DidFinishResourceLoad(blink::WebLocalFrame* frame,
     delegate_->PrintMessage(" - didFinishLoading\n");
   }
   resource_identifier_map_.erase(identifier);
-#if !defined(ENABLE_LOAD_COMPLETION_HACKS)
   CheckDone(frame, ResourceLoadCompleted);
-#endif
 }
 
 void WebTestProxyBase::DidAddMessageToConsole(
@@ -1265,17 +1263,9 @@ 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.

[Nate Chapin, 2014/12/11 18:21:13]

I found the bugs that required this quirk, the last of which was fixed in
http://src.chromium.org/viewvc/blink?view=revision&revision=186887

-  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);
 }