Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/web/ExternalPopupMenu.cpp

 /*
  * Copyright (C) 2010 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 134 matching lines @@
 void ExternalPopupMenu::updateFromElement()
 {
     if (m_needsUpdate)
         return;
     // TOOD(tkent): Even if DOMTreeVersion is not changed, we should update the
     // popup location/content in some cases.  e.g. Updating ComputedStyle of the
     // SELECT element affects popup position and OPTION style.
     if (m_shownDOMTreeVersion == m_ownerElement->document().domTreeVersion())
         return;
     m_needsUpdate = true;
-    m_ownerElement->document().postTask(BLINK_FROM_HERE, createSameThreadTask(&ExternalPopupMenu::update, PassRefPtrWillBeRawPtr<ExternalPopupMenu>(this)));
+    m_ownerElement->document().postTask(BLINK_FROM_HERE, createSameThreadTask(&ExternalPopupMenu::update, RawPtr<ExternalPopupMenu>(this)));
 }
 
 void ExternalPopupMenu::update()
 {
     if (!m_webExternalPopupMenu || !m_ownerElement)
         return;
     m_ownerElement->document().updateLayoutTreeIfNeeded();
     // disconnectClient() might have been called.
     if (!m_ownerElement)
         return;
@@ skipping 14 matching lines @@
 void ExternalPopupMenu::didChangeSelection(int index)
 {
 }
 
 void ExternalPopupMenu::didAcceptIndex(int index)
 {
     // Calling methods on the HTMLSelectElement might lead to this object being
     // derefed. This ensures it does not get deleted while we are running this
     // method.
     int popupMenuItemIndex = toPopupMenuItemIndex(index, *m_ownerElement);
-    RefPtrWillBeRawPtr<ExternalPopupMenu> guard(this);
+    RawPtr<ExternalPopupMenu> guard(this);
 
     if (m_ownerElement) {
         m_ownerElement->popupDidHide();
         m_ownerElement->valueChanged(popupMenuItemIndex);
     }
     m_webExternalPopupMenu = 0;
 }
 
 void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices)
 {
     if (!m_ownerElement) {
         m_webExternalPopupMenu = 0;
         return;
     }
 
     // Calling methods on the HTMLSelectElement might lead to this object being
     // derefed. This ensures it does not get deleted while we are running this
     // method.
-    RefPtrWillBeRawPtr<ExternalPopupMenu> protect(this);
-    RefPtrWillBeRawPtr<HTMLSelectElement> ownerElement(m_ownerElement.get());
+    RawPtr<ExternalPopupMenu> protect(this);
+    RawPtr<HTMLSelectElement> ownerElement(m_ownerElement.get());
     ownerElement->popupDidHide();
 
     if (indices.size() == 0) {
         ownerElement->valueChanged(static_cast<unsigned>(-1));
     } else {
         for (size_t i = 0; i < indices.size(); ++i)
             ownerElement->listBoxSelectItem(toPopupMenuItemIndex(indices[i], *ownerElement), (i > 0), false, (i == indices.size() - 1));
     }
 
     m_webExternalPopupMenu = 0;
 }
 
 void ExternalPopupMenu::didCancel()
 {
     // See comment in didAcceptIndex on why we need this.
-    RefPtrWillBeRawPtr<ExternalPopupMenu> guard(this);
+    RawPtr<ExternalPopupMenu> guard(this);
 
     if (m_ownerElement)
         m_ownerElement->popupDidHide();
     m_webExternalPopupMenu = 0;
 }
 
 void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo& info, HTMLSelectElement& ownerElement)
 {
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = ownerElement.listItems();
+    const HeapVector<Member<HTMLElement>>& listItems = ownerElement.listItems();
     size_t itemCount = listItems.size();
     size_t count = 0;
     Vector<WebMenuItemInfo> items(itemCount);
     for (size_t i = 0; i < itemCount; ++i) {
         if (ownerElement.itemIsDisplayNone(*listItems[i]))
             continue;
 
         Element& itemElement = *listItems[i];
         WebMenuItemInfo& popupItem = items[count++];
         popupItem.label = ownerElement.itemText(itemElement);
@@ skipping 24 matching lines @@
     info.items = items;
 
 }
 
 int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex, HTMLSelectElement& ownerElement)
 {
     if (externalPopupMenuItemIndex < 0)
         return externalPopupMenuItemIndex;
 
     int indexTracker = 0;
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& items = ownerElement.listItems();
+    const HeapVector<Member<HTMLElement>>& items = ownerElement.listItems();
     for (int i = 0; i < static_cast<int>(items.size()); ++i) {
         if (ownerElement.itemIsDisplayNone(*items[i]))
             continue;
         if (indexTracker++ == externalPopupMenuItemIndex)
             return i;
     }
     return -1;
 }
 
 int ExternalPopupMenu::toExternalPopupMenuItemIndex(int popupMenuItemIndex, HTMLSelectElement& ownerElement)
 {
     if (popupMenuItemIndex < 0)
         return popupMenuItemIndex;
 
     size_t indexTracker = 0;
-    const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& items = ownerElement.listItems();
+    const HeapVector<Member<HTMLElement>>& items = ownerElement.listItems();
     for (int i = 0; i < static_cast<int>(items.size()); ++i) {
         if (ownerElement.itemIsDisplayNone(*items[i]))
             continue;
         if (popupMenuItemIndex == i)
             return indexTracker;
         ++indexTracker;
     }
     return -1;
 }
 
 } // namespace blink