Oilpan: Remove WillBe types (part 13)

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 198 matching lines @@
         DifferentDocument,
         Fragment,
         HistoryApi
     };
     void setHistoryItemStateForCommit(HistoryCommitType, HistoryNavigationType);
 
     void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> stateObject, FrameLoadType, HistoryLoadType, ClientRedirectPolicy);
 
     void scheduleCheckCompleted();
 
-    void detachDocumentLoader(RefPtrWillBeMember<DocumentLoader>&);
+    void detachDocumentLoader(Member<DocumentLoader>&);
 
-    RawPtrWillBeMember<LocalFrame> m_frame;
+    Member<LocalFrame> m_frame;
 
     // FIXME: These should be OwnPtr<T> to reduce build times and simplify
     // header dependencies unless performance testing proves otherwise.
     // Some of these could be lazily created for memory savings on devices.
     mutable FrameLoaderStateMachine m_stateMachine;
 
-    OwnPtrWillBeMember<ProgressTracker> m_progressTracker;
+    Member<ProgressTracker> m_progressTracker;
 
     FrameLoadType m_loadType;
 
     // 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.
-    RefPtrWillBeMember<DocumentLoader> m_documentLoader;
-    RefPtrWillBeMember<DocumentLoader> m_provisionalDocumentLoader;
+    Member<DocumentLoader> m_documentLoader;
+    Member<DocumentLoader> m_provisionalDocumentLoader;
 
-    RefPtrWillBeMember<HistoryItem> m_currentItem;
-    RefPtrWillBeMember<HistoryItem> m_provisionalItem;
+    Member<HistoryItem> m_currentItem;
+    Member<HistoryItem> m_provisionalItem;
 
-    class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<DeferredHistoryLoad> {
+    class DeferredHistoryLoad : public GarbageCollectedFinalized<DeferredHistoryLoad> {
         WTF_MAKE_NONCOPYABLE(DeferredHistoryLoad);
     public:
-        static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceRequest request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoadType)
+        static RawPtr<DeferredHistoryLoad> create(ResourceRequest request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoadType)
         {
-            return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loadType, historyLoadType));
+            return new DeferredHistoryLoad(request, item, loadType, historyLoadType);
         }
 
         DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoadType loadType,
             HistoryLoadType historyLoadType)
             : m_request(request)
             , m_item(item)
             , m_loadType(loadType)
             , m_historyLoadType(historyLoadType)
         {
         }
 
         DEFINE_INLINE_TRACE()
         {
             visitor->trace(m_item);
         }
 
         ResourceRequest m_request;
-        RefPtrWillBeMember<HistoryItem> m_item;
+        Member<HistoryItem> m_item;
         FrameLoadType m_loadType;
         HistoryLoadType m_historyLoadType;
     };
 
-    OwnPtrWillBeMember<DeferredHistoryLoad> m_deferredHistoryLoad;
+    Member<DeferredHistoryLoad> m_deferredHistoryLoad;
 
     bool m_inStopAllLoaders;
 
     Timer<FrameLoader> m_checkTimer;
 
     bool m_didAccessInitialDocument;
     Timer<FrameLoader> m_didAccessInitialDocumentTimer;
 
     SandboxFlags m_forcedSandboxFlags;
 
     bool m_dispatchingDidClearWindowObjectInMainWorld;
     bool m_protectProvisionalLoader;
 };
 
 } // namespace blink
 
 #endif // FrameLoader_h