[Media Router] Connection state change listening redesign part 2.

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 <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 345 matching lines @@
         blink::WebString::fromUTF8(error->message)));
     return;
   }
 
   DCHECK(!session_info.is_null());
   callback->onSuccess(blink::adoptWebPtr(
       new PresentationConnectionClient(session_info.Clone())));
   presentation_service_->ListenForSessionMessages(session_info.Pass());
 }
 
-void PresentationDispatcher::OnSessionStateChanged(
-    presentation::PresentationSessionInfoPtr session_info,
-    presentation::PresentationConnectionState session_state) {
+void PresentationDispatcher::OnConnectionStateChanged(
+    presentation::PresentationSessionInfoPtr connection,
+    presentation::PresentationConnectionState state) {
   if (!controller_)
     return;
 
-  DCHECK(!session_info.is_null());
+  DCHECK(!connection.is_null());
   controller_->didChangeSessionState(
-      new PresentationConnectionClient(session_info.Pass()),
-      GetWebPresentationConnectionStateFromMojo(session_state));
+      new PresentationConnectionClient(connection.Pass()),
+      GetWebPresentationConnectionStateFromMojo(state));
 }
 
 void PresentationDispatcher::OnSessionMessagesReceived(
     presentation::PresentationSessionInfoPtr session_info,
     mojo::Array<presentation::SessionMessagePtr> messages) {
   if (!controller_)
     return;
 
   for (size_t i = 0; i < messages.size(); ++i) {
     // Note: Passing batches of messages to the Blink layer would be more
@@ skipping 27 matching lines @@
 
 void PresentationDispatcher::ConnectToPresentationServiceIfNeeded() {
   if (presentation_service_.get())
     return;
 
   render_frame()->GetServiceRegistry()->ConnectToRemoteService(
       mojo::GetProxy(&presentation_service_));
   presentation::PresentationServiceClientPtr client_ptr;
   binding_.Bind(GetProxy(&client_ptr));
   presentation_service_->SetClient(client_ptr.Pass());
-
-  presentation_service_->ListenForSessionStateChange();
 }
 
 void PresentationDispatcher::UpdateListeningState(AvailabilityStatus* status) {
   bool should_listen = !status->availability_callbacks.IsEmpty() ||
                        !status->availability_observers.empty();
   bool is_listening = status->listening_state != ListeningState::INACTIVE;
 
   if (should_listen == is_listening)
     return;
 
@@ skipping 57 matching lines @@
 PresentationDispatcher::AvailabilityStatus::AvailabilityStatus(
     const std::string& availability_url)
     : url(availability_url),
       last_known_availability(false),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::AvailabilityStatus::~AvailabilityStatus() {
 }
 
 }  // namespace content