[Presentation API] return valid WebPresentationConnection object in PresentationReceiver

third_party/WebKit/Source/modules/presentation/PresentationReceiver.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 "modules/presentation/PresentationReceiver.h"
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
@@ skipping 31 matching lines @@
 }
 
 WebPresentationConnection* PresentationReceiver::onReceiverConnectionAvailable(
     const WebPresentationSessionInfo& sessionInfo) {
   // take() will call PresentationReceiver::registerConnection()
   // and register the connection.
   auto connection = PresentationConnection::take(this, sessionInfo);
 
   // receiver.connectionList property not accessed
   if (!m_connectionListProperty)
-    return nullptr;
+    return connection;
 
   if (m_connectionListProperty->getState() ==
-      ScriptPromisePropertyBase::Pending)
+      ScriptPromisePropertyBase::Pending) {
     m_connectionListProperty->resolve(m_connectionList);
-  else if (m_connectionListProperty->getState() ==
-           ScriptPromisePropertyBase::Resolved)
+  } else if (m_connectionListProperty->getState() ==
+             ScriptPromisePropertyBase::Resolved) {
     m_connectionList->dispatchConnectionAvailableEvent(connection);
+  }
 
   return connection;
 }
 
 void PresentationReceiver::registerConnection(
     PresentationConnection* connection) {
   DCHECK(m_connectionList);
   m_connectionList->addConnection(connection);
 }
 
 void PresentationReceiver::recordOriginTypeAccess(Document* document) const {
   DCHECK(document);
   if (document->isSecureContext()) {
     UseCounter::count(document, UseCounter::PresentationReceiverSecureOrigin);
   } else {
     UseCounter::count(document, UseCounter::PresentationReceiverInsecureOrigin);
   }
 }
 
 DEFINE_TRACE(PresentationReceiver) {
   visitor->trace(m_connectionList);
   visitor->trace(m_connectionListProperty);
   ContextClient::trace(visitor);
 }
 
 }  // namespace blink