Revert of [Presentation API / Media Router] Clean up default pres URL logic.

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 319 matching lines @@
   }
   status->availability_callbacks.Clear();
   UpdateListeningState(status);
 }
 
 void PresentationDispatcher::OnDefaultSessionStarted(
     presentation::PresentationSessionInfoPtr session_info) {
   if (!controller_)
     return;
 
+  // Reset the callback to get the next event.
+  presentation_service_->ListenForDefaultSessionStart(base::Bind(
+      &PresentationDispatcher::OnDefaultSessionStarted,
+      base::Unretained(this)));
+
   if (!session_info.is_null()) {
     controller_->didStartDefaultSession(
         new PresentationConnectionClient(session_info.Clone()));
     presentation_service_->ListenForSessionMessages(session_info.Pass());
   }
 }
 
 void PresentationDispatcher::OnSessionCreated(
     blink::WebPresentationConnectionClientCallbacks* callback,
     presentation::PresentationSessionInfoPtr session_info,
@@ skipping 64 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_->ListenForDefaultSessionStart(base::Bind(
+      &PresentationDispatcher::OnDefaultSessionStarted,
+      base::Unretained(this)));
   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 58 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