Move shell interfaces into the shell.mojom namespace.

mojo/shell/application_instance.cc

 // Copyright 2015 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 "mojo/shell/application_instance.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 
 namespace mojo {
 namespace shell {
 
 ApplicationInstance::ApplicationInstance(
-    ApplicationPtr application,
+    mojom::ApplicationPtr application,
     ApplicationManager* manager,
     const Identity& identity,
     uint32_t requesting_content_handler_id,
     const base::Closure& on_application_end)
     : manager_(manager),
       id_(GenerateUniqueID()),
       identity_(identity),
       allow_any_application_(identity.filter().size() == 1 &&
                              identity.filter().count("*") == 1),
       requesting_content_handler_id_(requesting_content_handler_id),
@@ skipping 38 matching lines @@
 void ApplicationInstance::BindPIDReceiver(
     InterfaceRequest<mojom::PIDReceiver> pid_receiver) {
   pid_receiver_binding_.Bind(std::move(pid_receiver));
 }
 
 // Shell implementation:
 void ApplicationInstance::ConnectToApplication(
     URLRequestPtr app_request,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
-    CapabilityFilterPtr filter,
+    mojom::CapabilityFilterPtr filter,
     const ConnectToApplicationCallback& callback) {
   std::string url_string = app_request->url.To<std::string>();
   GURL url(url_string);
   if (!url.is_valid()) {
     LOG(ERROR) << "Error: invalid URL: " << url_string;
     callback.Run(kInvalidApplicationID, kInvalidApplicationID);
     return;
   }
   if (allow_any_application_ ||
       identity_.filter().find(url.spec()) != identity_.filter().end()) {
@@ skipping 98 matching lines @@
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_)
     CallAcceptConnection(make_scoped_ptr(request));
 
   queued_client_requests_.clear();
 }
 
 }  // namespace shell
 }  // namespace mojo