| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 449912a486f24c55f874b5bf49186259a6301e81..aa5f1079b87b5c744771e5023be94f14cd81297a 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -344,7 +344,7 @@
|
| #endif
|
|
|
| #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| -#include "media/mojo/services/mojo_media_application_factory.h" // nogncheck
|
| +#include "media/mojo/services/media_service_factory.h" // nogncheck
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -2998,8 +2998,8 @@ void ChromeContentBrowserClient::RegisterInProcessServices(
|
| StaticServiceMap* services) {
|
| #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| content::ServiceInfo info;
|
| - info.factory = base::Bind(&media::CreateMojoMediaApplication);
|
| - services->insert(std::make_pair("service:media", app_info));
|
| + info.factory = base::Bind(&media::CreateMediaService);
|
| + services->insert(std::make_pair("service:media", info));
|
| #endif
|
| #if defined(OS_CHROMEOS)
|
| content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter(
|
|
|