Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/dom/custom/CustomElementUpgradeCandidateMap.cpp

 /*
  * Copyright (C) 2013 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/dom/custom/CustomElementUpgradeCandidateMap.h"
 
 #include "core/dom/Element.h"
 
 namespace blink {
 
-PassOwnPtrWillBeRawPtr<CustomElementUpgradeCandidateMap> CustomElementUpgradeCandidateMap::create()
+RawPtr<CustomElementUpgradeCandidateMap> CustomElementUpgradeCandidateMap::create()
 {
-    return adoptPtrWillBeNoop(new CustomElementUpgradeCandidateMap());
+    return new CustomElementUpgradeCandidateMap();
 }
 
 CustomElementUpgradeCandidateMap::~CustomElementUpgradeCandidateMap()
 {
 #if !ENABLE(OILPAN)
     // With Oilpan enabled, the observer table keeps a weak reference to the
     // element; no need for explicit removal.
     UpgradeCandidateMap::const_iterator::KeysIterator end = m_upgradeCandidates.end().keys();
     for (UpgradeCandidateMap::const_iterator::KeysIterator it = m_upgradeCandidates.begin().keys(); it != end; ++it)
         unobserve(*it);
 #endif
 }
 
 void CustomElementUpgradeCandidateMap::add(const CustomElementDescriptor& descriptor, Element* element)
 {
     observe(element);
 
     UpgradeCandidateMap::AddResult result = m_upgradeCandidates.add(element, descriptor);
     ASSERT_UNUSED(result, result.isNewEntry);
 
     UnresolvedDefinitionMap::iterator it = m_unresolvedDefinitions.find(descriptor);
     ElementSet* elements;
     if (it == m_unresolvedDefinitions.end())
-        elements = m_unresolvedDefinitions.add(descriptor, adoptPtrWillBeNoop(new ElementSet())).storedValue->value.get();
+        elements = m_unresolvedDefinitions.add(descriptor, new ElementSet()).storedValue->value.get();
     else
         elements = it->value.get();
     elements->add(element);
 }
 
 void CustomElementUpgradeCandidateMap::elementWasDestroyed(Element* element)
 {
     CustomElementObserver::elementWasDestroyed(element);
     UpgradeCandidateMap::iterator candidate = m_upgradeCandidates.find(element);
     ASSERT_WITH_SECURITY_IMPLICATION(candidate != m_upgradeCandidates.end());
 
     UnresolvedDefinitionMap::iterator elements = m_unresolvedDefinitions.find(candidate->value);
     ASSERT_WITH_SECURITY_IMPLICATION(elements != m_unresolvedDefinitions.end());
     elements->value->remove(element);
     m_upgradeCandidates.remove(candidate);
 }
 
-PassOwnPtrWillBeRawPtr<CustomElementUpgradeCandidateMap::ElementSet> CustomElementUpgradeCandidateMap::takeUpgradeCandidatesFor(const CustomElementDescriptor& descriptor)
+RawPtr<CustomElementUpgradeCandidateMap::ElementSet> CustomElementUpgradeCandidateMap::takeUpgradeCandidatesFor(const CustomElementDescriptor& descriptor)
 {
-    OwnPtrWillBeRawPtr<ElementSet> candidates = m_unresolvedDefinitions.take(descriptor);
+    RawPtr<ElementSet> candidates = m_unresolvedDefinitions.take(descriptor);
 
     if (!candidates)
         return nullptr;
 
     for (const auto& candidate : *candidates) {
         unobserve(candidate);
         m_upgradeCandidates.remove(candidate);
     }
     return candidates.release();
 }
 
 DEFINE_TRACE(CustomElementUpgradeCandidateMap)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_upgradeCandidates);
     visitor->trace(m_unresolvedDefinitions);
 #endif
     CustomElementObserver::trace(visitor);
 }
 
 } // namespace blink