Simplify parsing/loading state, attempt #2

components/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 "components/test_runner/web_test_proxy.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <cctype>
@@ skipping 946 matching lines @@
     PrintFrameDescription(delegate_, frame);
     delegate_->PrintMessage(
         " - didReceiveServerRedirectForProvisionalLoadForFrame\n");
   }
 }
 
 bool WebTestProxyBase::DidFailProvisionalLoad(
     blink::WebLocalFrame* frame,
     const blink::WebURLError& error,
     blink::WebHistoryCommitType commit_type) {
+  DCHECK(frame->provisionalDataSource());

[Nate Chapin, 2016/03/22 16:42:43]

Apparently the "return !frame->provisionalDataSource();" below masked the crash
described in crbug.com/594364 in all of our tests. It's intended to catch the
case where CheckDone() synchronously cancels the provisional load and not notify
RenderFrameImpl, since RenderFrameImpl::didFailProvisionalLoad() assumes
frame->provisionalDataSource() is non-null. However, there were a bunch of tests
where frame->provisionalDataSource() was null at the point of this DCHECK, and
if that's the case, we will always crash outside of content_shell.

Unfortunately, we apparently didn't have any non-content_shell tests that
tickled the bug, so it made it to canary before ALL the things started crashing.

   if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->PrintMessage(" - didFailProvisionalLoadWithError\n");
   }
   CheckDone(frame, MainResourceLoadFailed);
   return !frame->provisionalDataSource();
 }
 
 void WebTestProxyBase::DidCommitProvisionalLoad(
     blink::WebLocalFrame* frame,
@@ skipping 328 matching lines @@
     callback->onError(blink::WebSetSinkIdError::NotAuthorized);
   else
     callback->onError(blink::WebSetSinkIdError::NotFound);
 }
 
 blink::WebString WebTestProxyBase::acceptLanguages() {
   return blink::WebString::fromUTF8(accept_languages_);
 }
 
 }  // namespace test_runner