Revert of Move most of FrameLoader::CheckCompleted() to Document

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 384 matching lines @@
 }
 
 void DocumentLoader::LoadFailed(const ResourceError& error) {
   if (!error.IsCancellation() && frame_->Owner()) {
     // FIXME: For now, fallback content doesn't work cross process.
     if (frame_->Owner()->IsLocal())
       frame_->DeprecatedLocalOwner()->RenderFallbackContent();
   }
 
   HistoryCommitType history_commit_type = LoadTypeToCommitType(load_type_);
-  switch (state_) {
-    case kNotStarted:
+  FrameLoader& loader = GetFrameLoader();
+  if (state_ < kCommitted) {
+    if (state_ == kNotStarted)
       probe::frameClearedScheduledClientNavigation(frame_);
-    // Fall-through
-    case kProvisional:
-      state_ = kSentDidFinishLoad;
-      GetLocalFrameClient().DispatchDidFailProvisionalLoad(error,
-                                                           history_commit_type);
-      if (frame_)
-        GetFrameLoader().DetachProvisionalDocumentLoader(this);
-      break;
-    case kCommitted:
-      if (frame_->GetDocument()->Parser())
-        frame_->GetDocument()->Parser()->StopParsing();
-      state_ = kSentDidFinishLoad;
-      GetLocalFrameClient().DispatchDidFailLoad(error, history_commit_type);
-      if (frame_)
-        frame_->GetDocument()->CheckCompleted();
-      break;
-    case kSentDidFinishLoad:
-      // TODO(japhet): Why do we need to call DidFinishNavigation() again?
-      GetFrameLoader().DidFinishNavigation();
-      break;
+    state_ = kSentDidFinishLoad;
+    GetLocalFrameClient().DispatchDidFailProvisionalLoad(error,
+                                                         history_commit_type);
+    if (!frame_)
+      return;
+    loader.DetachProvisionalDocumentLoader(this);
+  } else if (state_ == kCommitted) {
+    if (frame_->GetDocument()->Parser())
+      frame_->GetDocument()->Parser()->StopParsing();
+    state_ = kSentDidFinishLoad;
+    GetLocalFrameClient().DispatchDidFailLoad(error, history_commit_type);
   }
-  DCHECK_EQ(kSentDidFinishLoad, state_);
+  loader.CheckCompleted();
 }
 
 void DocumentLoader::FinishedLoading(double finish_time) {
   DCHECK(frame_->Loader().StateMachine()->CreatingInitialEmptyDocument() ||
          !frame_->GetPage()->Suspended() ||
          MainThreadDebugger::Instance()->IsPaused());
 
   double response_end_time = finish_time;
   if (!response_end_time)
     response_end_time = time_of_last_data_received_;
@@ skipping 654 matching lines @@
                      InstallNewDocumentReason::kJavascriptURL,
                      kForceSynchronousParsing, KURL());
   if (!source.IsNull())
     writer_->AppendReplacingData(source);
   EndWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink