Cleanup blink-side PlzNavigate logic

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 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 2029 matching lines @@
 }
 
 bool WebLocalFrameImpl::maybeRenderFallbackContent(
     const WebURLError& error) const {
   DCHECK(frame());
 
   if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent())
     return false;
 
   FrameLoader& frameloader = frame()->loader();
-  frameloader.clearNavigationHandledByClient();
-  frameloader.loadFailed(frameloader.documentLoader(), error);
+  frameloader.loadFailed(frameloader.provisionalDocumentLoader(), error);

[ananta, 2017/03/01 23:13:17]

Is provisionalDocumentLoader() guaranteed to be not null here?. Perhaps a
DCHECK?

[Nate Chapin, 2017/03/01 23:37:46]

Done.

   return true;
 }
 
 bool WebLocalFrameImpl::isLoading() const {
   if (!frame() || !frame()->document())
     return false;
   return frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() ||
          frame()->loader().hasProvisionalNavigation() ||
          !frame()->document()->loadEventFinished();
 }
@@ skipping 376 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink