[Presentation API] Change connection to 'connected' if start a presentation with "https://www.googl…

content/renderer/presentation/presentation_dispatcher.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/renderer/presentation/presentation_dispatcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 365 matching lines @@
 
   std::vector<GURL> urls;
   for (const auto& url : presentationUrls)
     urls.push_back(url);
 
   presentation_service_->SetDefaultPresentationUrls(urls);
 }
 
 void PresentationDispatcher::setReceiver(
     blink::WebPresentationReceiver* receiver) {
-  ConnectToPresentationServiceIfNeeded();
   receiver_ = receiver;
+
+  if (!render_frame() || !render_frame()->GetWebFrame())

[imcheng, 2017/04/08 00:05:59]

This seems a bit easier to understand if you flipped the condition and combined
with the case below, but I don't feel strongly.

[zhaobin, 2017/04/08 01:36:01]

Done.

+    return;
+
+  // Create receiver PSImpl after loading document.
+  if (!render_frame()->GetWebFrame()->isLoading())
+    ConnectToPresentationServiceIfNeeded();
 }
 
 void PresentationDispatcher::DidCommitProvisionalLoad(
     bool is_new_navigation,
     bool is_same_document_navigation) {
   blink::WebFrame* frame = render_frame()->GetWebFrame();
   // If not top-level navigation.
   if (frame->parent() || is_same_document_navigation)
     return;
 
   // Remove all pending send message requests.
   MessageRequestQueue empty;
   std::swap(message_request_queue_, empty);
 }
 
+void PresentationDispatcher::DidFinishDocumentLoad() {
+  if (receiver_)
+    ConnectToPresentationServiceIfNeeded();
+}
+
 void PresentationDispatcher::OnDestruct() {
   delete this;
 }
 
 void PresentationDispatcher::WidgetWillClose() {
   if (!receiver_)
     return;
 
   receiver_->didChangeConnectionState(
       blink::WebPresentationConnectionState::Terminated);
@@ skipping 371 matching lines @@
 
 PresentationDispatcher::ListeningStatus::ListeningStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(ScreenAvailability::UNKNOWN),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::ListeningStatus::~ListeningStatus() {}
 
 }  // namespace content