Oilpan: Build fix after r365666

third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 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
@@ skipping 112 matching lines @@
         delete this;
     }
 
     Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 } // namespace
 
 RTCPeerConnection::EventWrapper::EventWrapper(
     PassRefPtrWillBeRawPtr<Event> event,
-    PassOwnPtrWillBeRawPtr<BoolFunction> function)
+    PassOwnPtr<BoolFunction> function)
     : m_event(event)
     , m_setupFunction(function)
 {
 }
 
 bool RTCPeerConnection::EventWrapper::setup()
 {
     if (m_setupFunction) {
         return (*m_setupFunction)();
     }
     return true;
 }
 
+DEFINE_TRACE(RTCPeerConnection::EventWrapper)
+{
+    visitor->trace(m_event);
+}
+
 RTCConfiguration* RTCPeerConnection::parseConfiguration(const Dictionary& configuration, ExceptionState& exceptionState)
 {
     if (configuration.isUndefinedOrNull())
         return 0;
 
     RTCIceTransports iceTransports = RTCIceTransportsAll;
     String iceTransportsString;
     if (DictionaryHelper::get(configuration, "iceTransports", iceTransportsString)) {
         if (iceTransportsString == "none") {
             iceTransports = RTCIceTransportsNone;
@@ skipping 845 matching lines @@
     changeIceGatheringState(ICEGatheringStateComplete);
     changeSignalingState(SignalingStateClosed);
 }
 
 void RTCPeerConnection::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
 {
     scheduleDispatchEvent(event, nullptr);
 }
 
 void RTCPeerConnection::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event,
-    PassOwnPtrWillBeRawPtr<BoolFunction> setupFunction)
+    PassOwnPtr<BoolFunction> setupFunction)
 {
-    m_scheduledEvents.append(EventWrapper(event, setupFunction));
+    m_scheduledEvents.append(new EventWrapper(event, setupFunction));
 
     m_dispatchScheduledEventRunner.runAsync();
 }
 
 void RTCPeerConnection::dispatchScheduledEvent()
 {
     if (m_stopped)
         return;
 
-    WillBeHeapVector<EventWrapper> events;
+    HeapVector<Member<EventWrapper>> events;
     events.swap(m_scheduledEvents);
 
-    WillBeHeapVector<EventWrapper>::iterator it = events.begin();
+    HeapVector<Member<EventWrapper>>::iterator it = events.begin();
     for (; it != events.end(); ++it) {
-        if ((*it).setup()) {
-            dispatchEvent((*it).m_event.release());
+        if ((*it)->setup()) {
+            dispatchEvent((*it)->m_event.release());
         }
     }
 
     events.clear();
 }
 
 DEFINE_TRACE(RTCPeerConnection)
 {
     visitor->trace(m_localStreams);
     visitor->trace(m_remoteStreams);
     visitor->trace(m_dataChannels);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<RTCPeerConnection>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink