Replaces media::StrongBindingSet with mojo::StrongBindingSet.

media/mojo/services/interface_factory_impl.cc

 // 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.
 
 #include "media/mojo/services/interface_factory_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/media_log.h"
@@ skipping 97 matching lines @@
   }
 
   std::unique_ptr<MojoRendererService> mojo_renderer_service =
       base::MakeUnique<MojoRendererService>(
           cdm_service_context_.GetWeakPtr(), std::move(audio_sink),
           std::move(video_sink), std::move(renderer),
           MojoRendererService::InitiateSurfaceRequestCB());
 
   MojoRendererService* mojo_renderer_service_ptr = mojo_renderer_service.get();
 
-  StrongBindingSet<mojom::Renderer>::BindingId binding_id =
-      renderer_bindings_.AddBinding(std::move(mojo_renderer_service),
-                                    std::move(request));
+  mojo::BindingId binding_id = renderer_bindings_.AddBinding(
+      std::move(mojo_renderer_service), std::move(request));
 
   // base::Unretained() is safe because the callback will be fired by
   // |mojo_renderer_service|, which is owned by |renderer_bindings_|.
-  mojo_renderer_service_ptr->set_bad_message_cb(base::Bind(
-      base::IgnoreResult(&StrongBindingSet<mojom::Renderer>::RemoveBinding),
-      base::Unretained(&renderer_bindings_), binding_id));
+  mojo_renderer_service_ptr->set_bad_message_cb(
+      base::Bind(base::IgnoreResult(
+                     &mojo::StrongBindingSet<mojom::Renderer>::RemoveBinding),
+                 base::Unretained(&renderer_bindings_), binding_id));
 #endif  // defined(ENABLE_MOJO_RENDERER)
 }
 
 void InterfaceFactoryImpl::CreateCdm(
     mojo::InterfaceRequest<mojom::ContentDecryptionModule> request) {
 #if defined(ENABLE_MOJO_CDM)
   CdmFactory* cdm_factory = GetCdmFactory();
   if (!cdm_factory)
     return;
 
@@ skipping 17 matching lines @@
 CdmFactory* InterfaceFactoryImpl::GetCdmFactory() {
   if (!cdm_factory_) {
     cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get());
     LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
   }
   return cdm_factory_.get();
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
 }  // namespace media