| Index: chromecast/browser/cast_content_browser_client.cc
 | 
| diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
 | 
| index 1ca7c4c8fbcb4efd1e74827c7fe41b281754f47a..e32cf18881f36d13c85fd3fec7fc46020ad6d8e2 100644
 | 
| --- a/chromecast/browser/cast_content_browser_client.cc
 | 
| +++ b/chromecast/browser/cast_content_browser_client.cc
 | 
| @@ -77,7 +77,7 @@ namespace shell {
 | 
|  
 | 
|  namespace {
 | 
|  #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 | 
| -static std::unique_ptr<::shell::Service> CreateMojoMediaApplication(
 | 
| +static std::unique_ptr<service_manager::Service> CreateMojoMediaApplication(
 | 
|      CastContentBrowserClient* browser_client,
 | 
|      const base::Closure& quit_closure) {
 | 
|    std::unique_ptr<media::CastMojoMediaClient> mojo_media_client(
 | 
| @@ -88,7 +88,7 @@ static std::unique_ptr<::shell::Service> CreateMojoMediaApplication(
 | 
|                       base::Unretained(browser_client)),
 | 
|            browser_client->GetVideoResolutionPolicy(),
 | 
|            browser_client->media_resource_tracker()));
 | 
| -  return std::unique_ptr<::shell::Service>(
 | 
| +  return std::unique_ptr<service_manager::Service>(
 | 
|        new ::media::MojoMediaApplication(std::move(mojo_media_client),
 | 
|                                          quit_closure));
 | 
|  }
 | 
| @@ -416,7 +416,7 @@ bool CastContentBrowserClient::CanCreateWindow(
 | 
|  }
 | 
|  
 | 
|  void CastContentBrowserClient::ExposeInterfacesToRenderer(
 | 
| -    ::shell::InterfaceRegistry* registry,
 | 
| +    service_manager::InterfaceRegistry* registry,
 | 
|      content::RenderProcessHost* render_process_host) {
 | 
|    registry->AddInterface(
 | 
|        base::Bind(&media::MediaCapsImpl::AddBinding,
 | 
| 
 |