Move shell service to toplevel shell namespace

media/mojo/services/mojo_cdm_factory.h

Index: media/mojo/services/mojo_cdm_factory.h
diff --git a/media/mojo/services/mojo_cdm_factory.h b/media/mojo/services/mojo_cdm_factory.h
index d890d2f32c1b26536bdefbc03f6199da5271a29c..9571ce8a8b70c24e8966821d6f3166dfd14bfb0b 100644
--- a/media/mojo/services/mojo_cdm_factory.h
+++ b/media/mojo/services/mojo_cdm_factory.h
@@ -8,20 +8,17 @@
 #include "base/macros.h"
 #include "media/base/cdm_factory.h"
 
-namespace mojo {
 namespace shell {
 namespace mojom {
 class InterfaceProvider;
 }
 }
-}
 
 namespace media {
 
 class MojoCdmFactory : public CdmFactory {
  public:
-  explicit MojoCdmFactory(
-      mojo::shell::mojom::InterfaceProvider* interface_provider);
+  explicit MojoCdmFactory(shell::mojom::InterfaceProvider* interface_provider);
   ~MojoCdmFactory() final;
 
   // CdmFactory implementation.
@@ -36,7 +33,7 @@ class MojoCdmFactory : public CdmFactory {
               const CdmCreatedCB& cdm_created_cb) final;
 
  private:
-  mojo::shell::mojom::InterfaceProvider* interface_provider_;
+  shell::mojom::InterfaceProvider* interface_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdmFactory);
 };