Presentation API: Blink changes to allow getAvailability() to be rejected.

Source/modules/presentation/PresentationController.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/presentation/PresentationController.h"
 
 #include "core/frame/LocalFrame.h"
 #include "modules/presentation/PresentationSession.h"
 #include "public/platform/modules/presentation/WebPresentationClient.h"
@@ skipping 46 matching lines @@
 DEFINE_TRACE(PresentationController)
 {
     visitor->trace(m_presentation);
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
     LocalFrameLifecycleObserver::trace(visitor);
 }
 
 void PresentationController::didStartDefaultSession(WebPresentationSessionClient* sessionClient)
 {
     if (!m_presentation) {
-        PresentationSession::dispose(sessionClient);
+        delete sessionClient;
         return;
     }
 
     PresentationSession* session = PresentationSession::take(sessionClient, m_presentation);
     m_presentation->didStartDefaultSession(session);
 }
 
 void PresentationController::didChangeSessionState(WebPresentationSessionClient* sessionClient, WebPresentationSessionState state)
 {
-    if (m_presentation)
-        m_presentation->didChangeSessionState(sessionClient, state);
-    else
-        PresentationSession::dispose(sessionClient);
+    if (!m_presentation) {
+        delete sessionClient;
+        return;
+    }
+
+    m_presentation->didChangeSessionState(sessionClient, state);
 }
 
 void PresentationController::didReceiveSessionTextMessage(WebPresentationSessionClient* sessionClient, const WebString& message)
 {
-    if (m_presentation)
-        m_presentation->didReceiveSessionTextMessage(sessionClient, message);
-    else
-        PresentationSession::dispose(sessionClient);
+    if (!m_presentation) {
+        delete sessionClient;
+        return;
+    }
+
+    m_presentation->didReceiveSessionTextMessage(sessionClient, message);
 }
 
 void PresentationController::startSession(const String& presentationUrl, const String& presentationId, WebPresentationSessionClientCallbacks* callbacks)
 {
     if (!m_client) {
         delete callbacks;
         return;
     }
     m_client->startSession(presentationUrl, presentationId, callbacks);
 }
@@ skipping 49 matching lines @@
 
 void PresentationController::willDetachFrameHost()
 {
     if (m_client) {
         m_client->setController(nullptr);
         m_client = nullptr;
     }
 }
 
 } // namespace blink