Reland "Simplify FrameLoader::Clear(), remove FrameLoader::check_timer"

third_party/WebKit/Source/core/loader/FrameLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. 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:
@@ skipping 24 matching lines @@
 
 #include "core/CoreExport.h"
 #include "core/dom/IconURL.h"
 #include "core/dom/SandboxFlags.h"
 #include "core/dom/SecurityContext.h"
 #include "core/frame/FrameTypes.h"
 #include "core/loader/FrameLoaderStateMachine.h"
 #include "core/loader/FrameLoaderTypes.h"
 #include "core/loader/HistoryItem.h"
 #include "core/loader/NavigationPolicy.h"
-#include "platform/Timer.h"
 #include "platform/heap/Handle.h"
 #include "platform/instrumentation/tracing/TracedValue.h"
 #include "platform/loader/fetch/ResourceLoaderOptions.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/wtf/Forward.h"
 #include "platform/wtf/HashSet.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
 
 #include <memory>
 
@@ skipping 164 matching lines @@
   // while the client handles the navigation.
   bool HasProvisionalNavigation() const { return ProvisionalDocumentLoader(); }
 
   void DetachProvisionalDocumentLoader(DocumentLoader*);
 
   DECLARE_TRACE();
 
   static void SetReferrerForFrameRequest(FrameLoadRequest&);
 
  private:
-  void CheckTimerFired(TimerBase*);
-
   bool PrepareRequestForThisFrame(FrameLoadRequest&);
   FrameLoadType DetermineFrameLoadType(const FrameLoadRequest&);
 
   SubstituteData DefaultSubstituteDataForURL(const KURL&);
 
   bool ShouldPerformFragmentNavigation(bool is_form_submission,
                                        const String& http_method,
                                        FrameLoadType,
                                        const KURL&);
   void ProcessFragment(const KURL&, FrameLoadType, LoadStartType);
@@ skipping 42 matching lines @@
   // Document loaders for the three phases of frame loading. Note that while a
   // new request is being loaded, the old document loader may still be
   // referenced. E.g. while a new request is in the "policy" state, the old
   // document loader may be consulted in particular as it makes sense to imply
   // certain settings on the new loader.
   Member<DocumentLoader> document_loader_;
   Member<DocumentLoader> provisional_document_loader_;
 
   bool in_stop_all_loaders_;
 
-  TaskRunnerTimer<FrameLoader> check_timer_;
-
   SandboxFlags forced_sandbox_flags_;
 
   bool dispatching_did_clear_window_object_in_main_world_;
   bool protect_provisional_loader_;
   bool detached_;
 };
 
 }  // namespace blink
 
 #endif  // FrameLoader_h