[Media Router] Replace route messaging API.

chrome/browser/media/router/mojo/media_router_mojo_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 117 matching lines @@
                            OffTheRecordRoutesTerminatedOnProfileShutdown);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
                            RegisterAndUnregisterMediaSinksObserver);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
                            RegisterMediaSinksObserverWithAvailabilityChange);
   FRIEND_TEST_ALL_PREFIXES(
       MediaRouterMojoImplTest,
       RegisterAndUnregisterMediaSinksObserverWithAvailabilityChange);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
                            RegisterAndUnregisterMediaRoutesObserver);
+  FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
+                           PresentationSessionMessagesSingleObserver);
+  FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest,
+                           PresentationSessionMessagesMultipleObservers);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoImplTest, HandleIssue);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoExtensionTest,
                            DeferredBindingAndSuspension);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoExtensionTest,
                            DrainPendingRequestQueue);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoExtensionTest,
                            DropOldestPendingRequest);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoExtensionTest,
                            AttemptedWakeupTooManyTimes);
   FRIEND_TEST_ALL_PREFIXES(MediaRouterMojoExtensionTest,
@@ skipping 105 matching lines @@
       base::TimeDelta timeout,
       bool off_the_record);
   void DoTerminateRoute(const MediaRoute::Id& route_id);
   void DoDetachRoute(const MediaRoute::Id& route_id);
   void DoSendSessionMessage(const MediaRoute::Id& route_id,
                             const std::string& message,
                             const SendRouteMessageCallback& callback);
   void DoSendSessionBinaryMessage(const MediaRoute::Id& route_id,
                                   std::unique_ptr<std::vector<uint8_t>> data,
                                   const SendRouteMessageCallback& callback);
-  void DoListenForRouteMessages(const MediaRoute::Id& route_id);
+  void DoStartListeningForRouteMessages(const MediaRoute::Id& route_id);
   void DoStopListeningForRouteMessages(const MediaRoute::Id& route_id);
   void DoStartObservingMediaSinks(const MediaSource::Id& source_id);
   void DoStopObservingMediaSinks(const MediaSource::Id& source_id);
   void DoStartObservingMediaRoutes(const MediaSource::Id& source_id);
   void DoStopObservingMediaRoutes(const MediaSource::Id& source_id);
   void DoSearchSinks(
       const MediaSink::Id& sink_id,
       const MediaSource::Id& source_id,
       const std::string& search_input,
       const std::string& domain,
       const MediaSinkSearchResponseCallback& sink_callback);
 
-  // Invoked when the next batch of messages arrives.
-  // |route_id|: ID of route of the messages.
-  // |messages|: A list of messages received.
-  // |error|: true if an error occurred.
-  void OnRouteMessagesReceived(
-      const MediaRoute::Id& route_id,
-      mojo::Array<interfaces::RouteMessagePtr> messages,
-      bool error);
-
   // Error handler callback for |binding_| and |media_route_provider_|.
   void OnConnectionError();
 
   // interfaces::MediaRouter implementation.
   void RegisterMediaRouteProvider(
       interfaces::MediaRouteProviderPtr media_route_provider_ptr,
       const interfaces::MediaRouter::RegisterMediaRouteProviderCallback&
           callback) override;
   void OnIssue(interfaces::IssuePtr issue) override;
   void OnSinksReceived(const mojo::String& media_source,
                        mojo::Array<interfaces::MediaSinkPtr> sinks,
                        mojo::Array<mojo::String> origins) override;
   void OnRoutesUpdated(mojo::Array<interfaces::MediaRoutePtr> routes,
                        const mojo::String& media_source,
                        mojo::Array<mojo::String> joinable_route_ids) override;
   void OnSinkAvailabilityUpdated(
       interfaces::MediaRouter::SinkAvailability availability) override;
   void OnPresentationConnectionStateChanged(
       const mojo::String& route_id,
       interfaces::MediaRouter::PresentationConnectionState state) override;
   void OnPresentationConnectionClosed(
       const mojo::String& route_id,
       interfaces::MediaRouter::PresentationConnectionCloseReason reason,
       const mojo::String& message) override;
+  void OnRouteMessagesReceived(
+      const mojo::String& route_id,
+      mojo::Array<interfaces::RouteMessagePtr> messages) override;
 
   // Converts the callback result of calling Mojo CreateRoute()/JoinRoute()
   // into a local callback.
   void RouteResponseReceived(
       const std::string& presentation_id,
       bool off_the_record,
       const std::vector<MediaRouteResponseCallback>& callbacks,
       interfaces::MediaRoutePtr media_route,
       mojo::String error_text,
       interfaces::RouteRequestResultCode result_code);
@@ skipping 51 matching lines @@
   base::ScopedPtrHashMap<MediaSource::Id, std::unique_ptr<MediaRoutesQuery>>
       routes_queries_;
 
   using PresentationSessionMessagesObserverList =
       base::ObserverList<PresentationSessionMessagesObserver>;
   base::ScopedPtrHashMap<
       MediaRoute::Id,
       std::unique_ptr<PresentationSessionMessagesObserverList>>
       messages_observers_;
 
-  // IDs of MediaRoutes being listened for messages. Note that this is
-  // different from |message_observers_| because we might be waiting for
-  // |OnRouteMessagesReceived()| to be invoked after all observers for that
-  // route have been removed.
-  std::set<MediaRoute::Id> route_ids_listening_for_messages_;
-
   IssueManager issue_manager_;
 
   // Binds |this| to a Mojo connection stub for interfaces::MediaRouter.
   std::unique_ptr<mojo::Binding<interfaces::MediaRouter>> binding_;
 
   // Mojo proxy object for the Media Route Provider Manager.
   // Set to null initially, and later set to the Provider Manager proxy object
   // passed in via |RegisterMediaRouteProvider()|.
   // This is set to null again when the component extension is suspended
   // if or a Mojo channel error occured.
@@ skipping 38 matching lines @@
 #endif
 
   base::WeakPtrFactory<MediaRouterMojoImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_MOJO_IMPL_H_