Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/editing/VisibleSelection.h

 /*
  * Copyright (C) 2004 Apple Computer, 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 32 matching lines @@
 
 const TextAffinity SelDefaultAffinity = TextAffinity::Downstream;
 enum SelectionDirection { DirectionForward, DirectionBackward, DirectionRight, DirectionLeft };
 
 // Listener of |VisibleSelection| modification. |didChangeVisibleSelection()|
 // will be invoked when base, extent, start or end is moved to a different
 // position.
 //
 // Objects implementing |VisibleSelectionChangeObserver| interface must outlive
 // the |VisibleSelection| object.
-class CORE_EXPORT VisibleSelectionChangeObserver : public WillBeGarbageCollectedMixin {
+class CORE_EXPORT VisibleSelectionChangeObserver : public GarbageCollectedMixin {
     WTF_MAKE_NONCOPYABLE(VisibleSelectionChangeObserver);
 public:
     VisibleSelectionChangeObserver();
     virtual ~VisibleSelectionChangeObserver();
     virtual void didChangeVisibleSelection() = 0;
     DEFINE_INLINE_VIRTUAL_TRACE() { }
 };
 
 template <typename Strategy>
 class CORE_TEMPLATE_CLASS_EXPORT VisibleSelectionTemplate {
     DISALLOW_NEW();
-    DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(VisibleSelectionTemplate);
 public:
     VisibleSelectionTemplate();
     VisibleSelectionTemplate(const PositionTemplate<Strategy>&, TextAffinity, bool isDirectional = false);
     VisibleSelectionTemplate(const PositionTemplate<Strategy>& base, const PositionTemplate<Strategy>& extent, TextAffinity = SelDefaultAffinity, bool isDirectional = false);
     explicit VisibleSelectionTemplate(const EphemeralRangeTemplate<Strategy>&, TextAffinity = SelDefaultAffinity, bool isDirectional = false);
 
     explicit VisibleSelectionTemplate(const VisiblePositionTemplate<Strategy>&, bool isDirectional = false);
     VisibleSelectionTemplate(const VisiblePositionTemplate<Strategy>&, const VisiblePositionTemplate<Strategy>&, bool isDirectional = false);
 
     explicit VisibleSelectionTemplate(const PositionWithAffinityTemplate<Strategy>&, bool isDirectional = false);
@@ skipping 108 matching lines @@
     PositionTemplate<Strategy> m_extent;
     // Leftmost position when expanded to respect granularity
     PositionTemplate<Strategy> m_start;
     // Rightmost position when expanded to respect granularity
     PositionTemplate<Strategy> m_end;
 
     TextAffinity m_affinity; // the upstream/downstream affinity of the caret
 
     // Oilpan: this reference has a lifetime that is at least as long
     // as this object.
-    RawPtrWillBeMember<VisibleSelectionChangeObserver> m_changeObserver;
+    Member<VisibleSelectionChangeObserver> m_changeObserver;
 
     // these are cached, can be recalculated by validate()
     SelectionType m_selectionType; // None, Caret, Range
     bool m_baseIsFirst : 1; // True if base is before the extent
     bool m_isDirectional : 1; // Non-directional ignores m_baseIsFirst and selection always extends on shift + arrow key.
 
     TextGranularity m_granularity;
     // |updateIfNeeded()| uses |m_hasTrailingWhitespace| for word granularity.
     // |m_hasTrailingWhitespace| is set by |appendTrailingWhitespace()|.
     // TODO(yosin): Once we unify start/end and base/extent, we should get rid
     // of |m_hasTrailingWhitespace|.
     bool m_hasTrailingWhitespace : 1;
 };
 
 extern template class CORE_EXTERN_TEMPLATE_EXPORT VisibleSelectionTemplate<EditingStrategy>;
 extern template class CORE_EXTERN_TEMPLATE_EXPORT VisibleSelectionTemplate<EditingInFlatTreeStrategy>;
 
 using VisibleSelection = VisibleSelectionTemplate<EditingStrategy>;
 using VisibleSelectionInFlatTree = VisibleSelectionTemplate<EditingInFlatTreeStrategy>;
 
 // TODO(yosin): We should use |operator==()| instead of
 // |equalSelectionsInDOMTree()|.
 bool equalSelectionsInDOMTree(const VisibleSelection&, const VisibleSelection&);
 
 // We don't yet support multi-range selections, so we only ever have one range
 // to return.
 CORE_EXPORT EphemeralRange firstEphemeralRangeOf(const VisibleSelection&);
 
 // TODO(sof): move more firstRangeOf() uses to be over EphemeralRange instead.
-CORE_EXPORT PassRefPtrWillBeRawPtr<Range> firstRangeOf(const VisibleSelection&);
+CORE_EXPORT RawPtr<Range> firstRangeOf(const VisibleSelection&);
 
 } // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showTree(const blink::VisibleSelection&);
 void showTree(const blink::VisibleSelection*);
 void showTree(const blink::VisibleSelectionInFlatTree&);
 void showTree(const blink::VisibleSelectionInFlatTree*);
 #endif
 
 #endif // VisibleSelection_h