Pass application ids via AcceptConnection & ConnectToApplication callback.

components/html_viewer/media_factory.cc

 // Copyright 2014 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 "components/html_viewer/media_factory.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
 // media::Renderer implementation.
 // TODO(xhwang): Move this to media_switches.h.
 const char kEnableMojoMediaRenderer[] = "enable-mojo-media-renderer";
 
 bool AreSecureCodecsSupported() {
   // Hardware-secure codecs are not currently supported by HTML Viewer on any
   // platform.
   return false;
 }
 
-void OnGotContentHandlerID(uint32_t content_handler_id) {}
+void OnGotRemoteIDs(uint32_t remote_id, uint32_t content_handler_id) {}
 
 }  // namespace
 
 MediaFactory::MediaFactory(
     const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
     mojo::Shell* shell)
     :
 #if !defined(OS_ANDROID)
       media_thread_("Media"),
       audio_manager_(media::AudioManager::Create(&fake_audio_log_factory_)),
@@ skipping 64 matching lines @@
   return web_encrypted_media_client_.get();
 }
 
 media::interfaces::ServiceFactory* MediaFactory::GetMediaServiceFactory() {
   if (!media_service_factory_) {
     mojo::ServiceProviderPtr service_provider;
     mojo::URLRequestPtr request(mojo::URLRequest::New());
     request->url = mojo::String::From("mojo:media");
     shell_->ConnectToApplication(std::move(request),
                                  GetProxy(&service_provider), nullptr, nullptr,
-                                 base::Bind(&OnGotContentHandlerID));
+                                 base::Bind(&OnGotRemoteIDs));
     mojo::ConnectToService(service_provider.get(), &media_service_factory_);
   }
 
   return media_service_factory_.get();
 }
 
 media::MediaPermission* MediaFactory::GetMediaPermission() {
   // TODO(xhwang): Replace DefaultMediaPermission with something real when
   // permissions are supported in html_viewer.
   NOTIMPLEMENTED();
@@ skipping 29 matching lines @@
 scoped_refptr<base::SingleThreadTaskRunner>
 MediaFactory::GetMediaThreadTaskRunner() {
   if (!media_thread_.IsRunning())
     media_thread_.Start();
 
   return media_thread_.task_runner();
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace html_viewer