Move shell interfaces into the shell.mojom namespace.

mojo/shell/application_instance.h

Index: mojo/shell/application_instance.h
diff --git a/mojo/shell/application_instance.h b/mojo/shell/application_instance.h
index 5764478ec79137dc2903441e90e70d4b70af0288..cae14426010438bdb7e601664a3c619ef925fce9 100644
--- a/mojo/shell/application_instance.h
+++ b/mojo/shell/application_instance.h
@@ -30,13 +30,13 @@ class NativeRunner;
 
 // Encapsulates a connection to an instance of an application, tracked by the
 // shell's ApplicationManager.
-class ApplicationInstance : public Shell,
+class ApplicationInstance : public mojom::Shell,
                             public mojom::PIDReceiver {
  public:
   // |requesting_content_handler_id| is the id of the content handler that
   // loaded this app. If the app was not loaded by a content handler the id
   // is kInvalidContentHandlerID.
-  ApplicationInstance(ApplicationPtr application,
+  ApplicationInstance(mojom::ApplicationPtr application,
                       ApplicationManager* manager,
                       const Identity& identity,
                       uint32_t requesting_content_handler_id,
@@ -53,7 +53,7 @@ class ApplicationInstance : public Shell,
 
   void BindPIDReceiver(InterfaceRequest<mojom::PIDReceiver> pid_receiver);
 
-  Application* application() { return application_.get(); }
+  mojom::Application* application() { return application_.get(); }
   const Identity& identity() const { return identity_; }
   uint32_t id() const { return id_; }
   base::ProcessId pid() const { return pid_; }
@@ -72,7 +72,7 @@ class ApplicationInstance : public Shell,
       URLRequestPtr app_request,
       InterfaceRequest<ServiceProvider> services,
       ServiceProviderPtr exposed_services,
-      CapabilityFilterPtr filter,
+      mojom::CapabilityFilterPtr filter,
       const ConnectToApplicationCallback& callback) override;
   void QuitApplication() override;
 
@@ -98,8 +98,8 @@ class ApplicationInstance : public Shell,
   const bool allow_any_application_;
   uint32_t requesting_content_handler_id_;
   base::Closure on_application_end_;
-  ApplicationPtr application_;
-  Binding<Shell> binding_;
+  mojom::ApplicationPtr application_;
+  Binding<mojom::Shell> binding_;
   Binding<mojom::PIDReceiver> pid_receiver_binding_;
   bool queue_requests_;
   std::vector<ConnectToApplicationParams*> queued_client_requests_;