[Cast,Android,Presentation API] Send messages back to the right clients, listen for messages sooner.

content/renderer/presentation/presentation_dispatcher.cc

Index: content/renderer/presentation/presentation_dispatcher.cc
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index bcb33fade30ea6d9f49c6df76fface4e4235df51..957b392baaec5a8af67e3eb18f6008a9adfdfa74 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -338,9 +338,9 @@ void PresentationDispatcher::OnDefaultSessionStarted(
     return;
 
   if (!session_info.is_null()) {
+    presentation_service_->ListenForSessionMessages(session_info.Clone());
     controller_->didStartDefaultSession(
-        new PresentationConnectionClient(session_info.Clone()));
-    presentation_service_->ListenForSessionMessages(session_info.Pass());
+        new PresentationConnectionClient(session_info.Pass()));
   }
 }
 
@@ -358,9 +358,9 @@ void PresentationDispatcher::OnSessionCreated(
   }
 
   DCHECK(!session_info.is_null());
+  presentation_service_->ListenForSessionMessages(session_info.Clone());
   callback->onSuccess(blink::adoptWebPtr(
-      new PresentationConnectionClient(session_info.Clone())));
-  presentation_service_->ListenForSessionMessages(session_info.Pass());
+      new PresentationConnectionClient(session_info.Pass())));
 }
 
 void PresentationDispatcher::OnSessionStateChanged(