[Media Router] Wiring for searching route providers for new sinks.

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

Index: chrome/browser/media/router/mojo/media_router_mojo_impl.h
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.h b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
index 0106bd506789b78f6c8da905577a2b25636cfeaa..f8f1e0546c36b95206146b87302b7c484a109daf 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
@@ -11,6 +11,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
@@ -100,6 +101,17 @@ class MediaRouterMojoImpl : public MediaRouterBase,
   void AddIssue(const Issue& issue) override;
   void ClearIssue(const Issue::Id& issue_id) override;
   void OnUserGesture() override;
+  void SearchSinksAndCreateRoute(
+      const MediaSink::Id& sink_id,
+      const MediaSource::Id& source_id,
+      const std::string& search_input,
+      const std::string& domain,
+      const GURL& origin,
+      content::WebContents* web_contents,
+      const std::vector<MediaRouteResponseCallback>& route_callbacks,
+      const MediaSinkSearchResponseCallback& sink_callback,
+      base::TimeDelta timeout,
+      bool off_the_record) override;
 
   const std::string& media_route_provider_extension_id() const {
     return media_route_provider_extension_id_;
@@ -253,6 +265,17 @@ class MediaRouterMojoImpl : public MediaRouterBase,
   void DoStopObservingMediaSinks(const MediaSource::Id& source_id);
   void DoStartObservingMediaRoutes(const MediaSource::Id& source_id);
   void DoStopObservingMediaRoutes(const MediaSource::Id& source_id);
+  void DoSearchSinksAndCreateRoute(
+      const MediaSink::Id& sink_id,
+      const MediaSource::Id& source_id,
+      const std::string& search_input,
+      const std::string& domain,
+      const std::string& origin,
+      int tab_id,
+      const std::vector<MediaRouteResponseCallback>& route_callbacks,
+      const MediaSinkSearchResponseCallback& sink_callback,
+      base::TimeDelta timeout,
+      bool off_the_record);
 
   // Invoked when the next batch of messages arrives.
   // |route_id|: ID of route of the messages.
@@ -275,6 +298,8 @@ class MediaRouterMojoImpl : public MediaRouterBase,
   void OnSinksReceived(const mojo::String& media_source,
                        mojo::Array<interfaces::MediaSinkPtr> sinks,
                        mojo::Array<mojo::String> origins) override;
+  void OnSearchSinkIdReceived(const mojo::String& pseudo_sink_id,
+                              const mojo::String& sink_id) override;
   void OnRoutesUpdated(mojo::Array<interfaces::MediaRoutePtr> routes,
                        const mojo::String& media_source,
                        mojo::Array<mojo::String> joinable_route_ids) override;
@@ -298,6 +323,15 @@ class MediaRouterMojoImpl : public MediaRouterBase,
       const mojo::String& error_text,
       interfaces::RouteRequestResultCode result_code);
 
+  // Converts the callback result of calling Mojo SearchSinksAndCreateRoute()
+  // into a local callback.
+  void SearchAndCreateResponseReceived(
+      const std::string& presentation_id,
+      const std::vector<MediaRouteResponseCallback>& route_callbacks,
+      interfaces::MediaRoutePtr media_route,
+      const mojo::String& error_text,
+      interfaces::RouteRequestResultCode result_code);
+
   // Callback invoked by |event_page_tracker_| after an attempt to wake the
   // component extension. If |success| is false, the pending request queue is
   // drained.
@@ -345,6 +379,9 @@ class MediaRouterMojoImpl : public MediaRouterBase,
   base::ScopedPtrHashMap<MediaSource::Id, scoped_ptr<MediaRoutesQuery>>
       routes_queries_;
 
+  std::unordered_map<std::string, MediaSinkSearchResponseCallback>
+      search_callbacks_;

[imcheng, 2016/04/18 23:15:46]

Is it possible that multiple callbacks could exist for the same sink id at the
same time?

[btolsch, 2016/04/19 01:39:43]

One UI can't create that situation, but if two UIs could submit the search near
simultaneously then yes. I converted it to a list. Let me know if you'd rather
it stay as one entry and not handle this case.

+
   using PresentationSessionMessagesObserverList =
       base::ObserverList<PresentationSessionMessagesObserver>;
   base::ScopedPtrHashMap<MediaRoute::Id,