Rename shell namespace to service_manager

media/mojo/services/service_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/service_factory_impl.h"
 
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
@@ skipping 16 matching lines @@
 #endif  // defined(ENABLE_MOJO_RENDERER)
 
 #if defined(ENABLE_MOJO_CDM)
 #include "media/base/cdm_factory.h"
 #include "media/mojo/services/mojo_cdm_service.h"
 #endif  // defined(ENABLE_MOJO_CDM)
 
 namespace media {
 
 ServiceFactoryImpl::ServiceFactoryImpl(
-    shell::mojom::InterfaceProviderPtr interfaces,
+    service_manager::mojom::InterfaceProviderPtr interfaces,
     scoped_refptr<MediaLog> media_log,
-    std::unique_ptr<shell::ServiceContextRef> connection_ref,
+    std::unique_ptr<service_manager::ServiceContextRef> connection_ref,
     MojoMediaClient* mojo_media_client)
     :
 #if defined(ENABLE_MOJO_CDM)
       interfaces_(std::move(interfaces)),
 #endif
       media_log_(media_log),
       connection_ref_(std::move(connection_ref)),
       mojo_media_client_(mojo_media_client) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(mojo_media_client_);
@@ skipping 89 matching lines @@
 CdmFactory* ServiceFactoryImpl::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