[Presentation API, Android] Implement routes observers

chrome/browser/media/android/router/media_router_android.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_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 34 matching lines @@
                         const std::string& message,
                         const SendRouteMessageCallback& callback) override;
   void SendRouteBinaryMessage(
       const MediaRoute::Id& route_id,
       scoped_ptr<std::vector<uint8>> data,
       const SendRouteMessageCallback& callback) override;
   void ClearIssue(const Issue::Id& issue_id) override;
 
   // JNI functions.
   void OnSinksReceived(
-      JNIEnv* env, jobject obj, jstring source_urn, jint count);
+      JNIEnv* env, jobject obj, jstring jsource_urn, jint jcount);
   void OnRouteCreated(
       JNIEnv* env,
       jobject obj,
-      jstring media_route_id,
+      jstring jmedia_route_id,
       jint jcreate_route_request_id,
       jboolean jis_local);
   void OnRouteCreationError(
       JNIEnv* env,
       jobject obj,
-      jstring error_text,
+      jstring jerror_text,
       jint jcreate_route_request_id);
+  void OnRouteClosed(JNIEnv* env, jobject obj, jstring jmedia_route_id);
 
  private:
   friend class MediaRouterFactory;
 
   explicit MediaRouterAndroid(content::BrowserContext*);
 
+  void UpdateRoutesObservers();
+
   // MediaRouter implementation.
   void RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
   void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
   void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
   void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
   void RegisterIssuesObserver(IssuesObserver* observer) override;
   void UnregisterIssuesObserver(IssuesObserver* observer) override;
   void RegisterPresentationSessionMessagesObserver(
       PresentationSessionMessagesObserver* observer) override;
   void UnregisterPresentationSessionMessagesObserver(
       PresentationSessionMessagesObserver* observer) override;
 
   base::android::ScopedJavaGlobalRef<jobject> java_media_router_;
 
   using MediaSinkObservers = base::ScopedPtrHashMap<
       MediaSource::Id,
       scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
   MediaSinkObservers sinks_observers_;
 
+  base::ObserverList<MediaRoutesObserver> routes_observers_;
+
   struct CreateMediaRouteRequest {
     CreateMediaRouteRequest(
         const MediaSource& source,
         const MediaSink& sink,
         const std::string& presentation_id,
         const std::vector<MediaRouteResponseCallback>& callbacks);
     ~CreateMediaRouteRequest();
 
     MediaSource media_source;
     MediaSink media_sink;
     std::string presentation_id;
     std::vector<MediaRouteResponseCallback> callbacks;
   };
 
   using CreateMediaRouteRequests =
       IDMap<CreateMediaRouteRequest, IDMapOwnPointer>;
   CreateMediaRouteRequests create_route_requests_;
 
+  using MediaRoutes = base::ScopedPtrHashMap<
+      MediaRoute::Id, scoped_ptr<MediaRoute>>;
+  MediaRoutes active_routes_;

[mlamouri (slow - plz ping), 2015/08/18 22:39:37]

FWIW, I'm not sure if it is really helping to have a HashMap. Every time you
modify the map (O(1)), you end up creating a vector from that map (O(n)). So,
basically, it boils down to a O(n) operation. I wonder if it wouldn't be better
to simply have a vector for active_routes_ so at least you save creating a new
vector on the stack when there are changes.

Obviously, I do not have the big picture so maybe this map might come handy with
future CLs.

[whywhat, 2015/08/19 00:26:43]

Agreed. I don't think a map is needed in the future - we need a map from route
id to session id which already exists on the Java side. (unless there's a hope
that MediaRoutesObserver and MediaRouter Mojo interfaces are improved and we
don't have to pass all the routes in a vector each time :) Perhaps it's easier
to pass this array from JS of the component extension.

+
   DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
 };
 
 } // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_