Move shell service to toplevel shell namespace

media/mojo/services/mojo_media_application_factory.cc

 // Copyright 2016 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/mojo_media_application_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "media/mojo/services/mojo_media_application.h"
 
 #if defined(ENABLE_TEST_MOJO_MEDIA_CLIENT)
 #include "media/mojo/services/test_mojo_media_client.h"  // nogncheck
 using DefaultClient = media::TestMojoMediaClient;
 #elif defined(OS_ANDROID)
 #include "media/mojo/services/android_mojo_media_client.h"  // nogncheck
 using DefaultClient = media::AndroidMojoMediaClient;
 #else
 #include "media/mojo/services/default_mojo_media_client.h"  // nogncheck
 using DefaultClient = media::DefaultMojoMediaClient;
 #endif
 
 namespace media {
 
 // static
-std::unique_ptr<mojo::ShellClient> CreateMojoMediaApplication() {
-  return std::unique_ptr<mojo::ShellClient>(
+std::unique_ptr<shell::ShellClient> CreateMojoMediaApplication() {
+  return std::unique_ptr<shell::ShellClient>(
       new MojoMediaApplication(base::WrapUnique(new DefaultClient())));
 }
 
 }  // namespace media