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

chrome/browser/media/router/media_router_mojo_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 "chrome/browser/media/router/media_router_mojo_impl.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/router/issues_observer.h"
 #include "chrome/browser/media/router/local_media_routes_observer.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/media_router_type_converters.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
-#include "chrome/browser/media/router/presentation_connection_state_observer.h"
 #include "chrome/browser/media/router/presentation_session_messages_observer.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "extensions/browser/process_manager.h"
 
 #define DVLOG_WITH_INSTANCE(level) \
   DVLOG(level) << "MR #" << instance_id_ << ": "
 
 #define DLOG_WITH_INSTANCE(level) DLOG(level) << "MR #" << instance_id_ << ": "
 
 namespace media_router {
@@ skipping 468 matching lines @@
 void MediaRouterMojoImpl::UnregisterLocalMediaRoutesObserver(
     LocalMediaRoutesObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(observer);
 
   if (!local_routes_observers_.HasObserver(observer))
     return;
   local_routes_observers_.RemoveObserver(observer);
 }
 
-void MediaRouterMojoImpl::RegisterPresentationConnectionStateObserver(
-    PresentationConnectionStateObserver* observer) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(observer);
-
-  const MediaRoute::Id route_id = observer->route_id();
-  auto* observers = presentation_connection_state_observers_.get(route_id);
-  if (!observers) {
-    observers = new PresentationConnectionStateObserverList;
-    presentation_connection_state_observers_.add(route_id,
-                                                 make_scoped_ptr(observers));
-  }
-
-  if (observers->HasObserver(observer))
-    return;
-
-  observers->AddObserver(observer);
-}
-
-void MediaRouterMojoImpl::UnregisterPresentationConnectionStateObserver(
-    PresentationConnectionStateObserver* observer) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(observer);
-
-  const MediaRoute::Id route_id = observer->route_id();
-  auto* observers = presentation_connection_state_observers_.get(route_id);
-  if (!observers)
-    return;
-
-  observers->RemoveObserver(observer);
-  if (!observers->might_have_observers())
-    presentation_connection_state_observers_.erase(route_id);
-}
-
 void MediaRouterMojoImpl::DoCreateRoute(
     const MediaSource::Id& source_id,
     const MediaSink::Id& sink_id,
     const std::string& origin,
     int tab_id,
     const std::vector<MediaRouteResponseCallback>& callbacks) {
   std::string presentation_id("mr_");
   presentation_id += base::GenerateGUID();
   DVLOG_WITH_INSTANCE(1) << "DoCreateRoute " << source_id << "=>" << sink_id
                          << ", presentation ID: " << presentation_id;
@@ skipping 134 matching lines @@
 
 void MediaRouterMojoImpl::OnPresentationConnectionStateChanged(
     const mojo::String& route_id,
     interfaces::MediaRouter::PresentationConnectionState state) {
   if (!interfaces::MediaRouter::PresentationConnectionState_IsValidValue(
           state)) {
     DLOG(WARNING) << "Unknown PresentationConnectionState value " << state;
     return;
   }
 
-  auto* observers = presentation_connection_state_observers_.get(route_id);
-  if (!observers)
-    return;
-
-  content::PresentationConnectionState converted_state =
-      mojo::PresentationConnectionStateFromMojo(state);
-  FOR_EACH_OBSERVER(PresentationConnectionStateObserver, *observers,
-                    OnStateChanged(converted_state));
+  NotifyPresentationConnectionStateChange(
+      route_id, mojo::PresentationConnectionStateFromMojo(state));
 }
 
 void MediaRouterMojoImpl::DoOnPresentationSessionDetached(
     const MediaRoute::Id& route_id) {
   DVLOG_WITH_INSTANCE(1) << "DoOnPresentationSessionDetached " << route_id;
   media_route_provider_->OnPresentationSessionDetached(route_id);
 }
 
 bool MediaRouterMojoImpl::HasLocalDisplayRoute() const {
   return has_local_display_route_;
@@ skipping 123 matching lines @@
 }
 
 void MediaRouterMojoImpl::DrainPendingRequests() {
   DLOG_WITH_INSTANCE(ERROR)
       << "Draining request queue. (queue-length=" << pending_requests_.size()
       << ")";
   pending_requests_.clear();
 }
 
 }  // namespace media_router