Move shell service to toplevel shell namespace

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 907c3ce417f55512a8285c94e57a0da8bdc7117c..a5db1f9e5af3defa814da4607ad07fa480a3f753 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -636,9 +636,8 @@ class CONTENT_EXPORT RenderFrameImpl
       override;
 
   // Binds this render frame's service registry.
-  void BindServiceRegistry(
-      mojo::shell::mojom::InterfaceProviderRequest services,
-      mojo::shell::mojom::InterfaceProviderPtr exposed_services);
+  void BindServiceRegistry(shell::mojom::InterfaceProviderRequest services,
+                           shell::mojom::InterfaceProviderPtr exposed_services);
 
   ManifestManager* manifest_manager();
 
@@ -960,7 +959,7 @@ class CONTENT_EXPORT RenderFrameImpl
   bool AreSecureCodecsSupported();
 
 #if defined(ENABLE_MOJO_MEDIA)
-  mojo::shell::mojom::InterfaceProvider* GetMediaInterfaceProvider();
+  shell::mojom::InterfaceProvider* GetMediaInterfaceProvider();
 #endif
 
   media::CdmFactory* GetCdmFactory();
@@ -974,8 +973,7 @@ class CONTENT_EXPORT RenderFrameImpl
 
   // Connects to a Mojo application and returns a proxy to its exposed
   // ServiceProvider.
-  mojo::shell::mojom::InterfaceProviderPtr ConnectToApplication(
-      const GURL& url);
+  shell::mojom::InterfaceProviderPtr ConnectToApplication(const GURL& url);
 
   // Returns the media delegate for WebMediaPlayer usage.  If
   // |media_player_delegate_| is NULL, one is created.
@@ -1176,7 +1174,7 @@ class CONTENT_EXPORT RenderFrameImpl
   BlinkServiceRegistryImpl blink_service_registry_;
 
   // The shell proxy used to connect to Mojo applications.
-  mojo::shell::mojom::ConnectorPtr connector_;
+  shell::mojom::ConnectorPtr connector_;
 
   // The screen orientation dispatcher attached to the frame, lazily
   // initialized.