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

chrome/browser/media/router/media_router_mojo_impl.cc

Index: chrome/browser/media/router/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc
index 2e427c31f4d176cf70c585ae2b459164307117e3..aed184e0d03b76f6212d047b6f545d0e1434196f 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl.cc
@@ -17,7 +17,6 @@
 #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"
@@ -506,40 +505,6 @@ void MediaRouterMojoImpl::UnregisterLocalMediaRoutesObserver(
   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,
@@ -694,14 +659,8 @@ void MediaRouterMojoImpl::OnPresentationConnectionStateChanged(
     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(