Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with…

content/browser/presentation/presentation_service_impl.cc

 // 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 "content/browser/presentation/presentation_service_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "content/browser/presentation/presentation_type_converters.h"
@@ skipping 387 matching lines @@
 
   send_message_callback_.reset(new SendMessageMojoCallback(callback));
   delegate_->SendMessage(
       render_process_id_,
       render_frame_id_,
       GetPresentationSessionMessage(session_message.Pass()),
       base::Bind(&PresentationServiceImpl::OnSendMessageCallback,
                  weak_factory_.GetWeakPtr()));
 }
 
-void PresentationServiceImpl::OnSendMessageCallback() {
+void PresentationServiceImpl::OnSendMessageCallback(bool sent) {
   // It is possible that Reset() is invoked before receiving this callback.
   // So, always check send_message_callback_ for non-null.
   if (send_message_callback_) {
-    send_message_callback_->Run(true);
+    send_message_callback_->Run(sent);
     send_message_callback_.reset();
   }
 }
 
 void PresentationServiceImpl::CloseSession(
     const mojo::String& presentation_url,
     const mojo::String& presentation_id) {
   DVLOG(2) << "CloseSession " << presentation_id;
   if (delegate_)
     delegate_->CloseSession(render_process_id_, render_frame_id_,
@@ skipping 27 matching lines @@
 
   on_session_messages_callback_.reset(new SessionMessagesCallback(callback));
   delegate_->ListenForSessionMessages(
       render_process_id_, render_frame_id_,
       base::Bind(&PresentationServiceImpl::OnSessionMessages,
                  weak_factory_.GetWeakPtr()));
 }
 
 void PresentationServiceImpl::OnSessionMessages(
     scoped_ptr<ScopedVector<PresentationSessionMessage>> messages) {
-  DCHECK(messages.get() && !messages->empty());
   if (!on_session_messages_callback_.get()) {
     // The Reset method of this class was invoked.
     return;
   }
 
-  mojo::Array<presentation::SessionMessagePtr> mojoMessages(messages->size());
-  for (size_t i = 0; i < messages->size(); ++i) {
-    mojoMessages[i] = ToMojoSessionMessage((*messages)[i]);
+  if (!messages.get() || messages->empty()) {
+    on_session_messages_callback_->Run(

[Kevin M, 2015/06/24 23:02:07]

Add a comment indicating that branch is an error handler (it took some digging
for me to understand what empty array meant)

[haibinlu, 2015/06/24 23:25:13]

Done.

+        mojo::Array<presentation::SessionMessagePtr>());
+  } else {
+    mojo::Array<presentation::SessionMessagePtr> mojoMessages(messages->size());
+    for (size_t i = 0; i < messages->size(); ++i) {
+      mojoMessages[i] = ToMojoSessionMessage((*messages)[i]);
+    }
+    on_session_messages_callback_->Run(mojoMessages.Pass());
   }
 
-  on_session_messages_callback_->Run(mojoMessages.Pass());
   on_session_messages_callback_.reset();
 }
 
 void PresentationServiceImpl::DidNavigateAnyFrame(
     content::RenderFrameHost* render_frame_host,
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   DVLOG(2) << "PresentationServiceImpl::DidNavigateAnyFrame";
   if (!FrameMatches(render_frame_host))
     return;
@@ skipping 151 matching lines @@
 void PresentationServiceImpl::DefaultSessionStartContext::Reset() {
   ScopedVector<DefaultSessionMojoCallback> callbacks;
   callbacks.swap(callbacks_);
   for (const auto& callback : callbacks)
     callback->Run(presentation::PresentationSessionInfoPtr());
   session_.reset();
 }
 
 }  // namespace content