Move InterfaceProvider into the shell::mojom namespace like the rest of the shell interfaces.

mojo/shell/public/cpp/lib/shell_connection.cc

 // Copyright 2014 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 <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/converters/network/network_type_converters.h"
@@ skipping 62 matching lines @@
     return nullptr;
   DCHECK(params);
   URLRequestPtr request = params->TakeRequest();
   std::string application_url = request->url.To<std::string>();
   // We allow all interfaces on outgoing connections since we are presumably in
   // a position to know who we're talking to.
   // TODO(beng): is this a valid assumption or do we need to figure some way to
   //             filter here too?
   std::set<std::string> allowed;
   allowed.insert("*");
-  InterfaceProviderPtr local_interfaces;
-  InterfaceRequest<InterfaceProvider> local_request =
+  shell::mojom::InterfaceProviderPtr local_interfaces;
+  shell::mojom::InterfaceProviderRequest local_request =
       GetProxy(&local_interfaces);
-  InterfaceProviderPtr remote_interfaces;
-  InterfaceRequest<InterfaceProvider> remote_request =
+  shell::mojom::InterfaceProviderPtr remote_interfaces;
+  shell::mojom::InterfaceProviderRequest remote_request =
       GetProxy(&remote_interfaces);
   scoped_ptr<internal::ConnectionImpl> registry(new internal::ConnectionImpl(
       application_url, application_url,
       shell::mojom::Shell::kInvalidApplicationID, std::move(remote_interfaces),
       std::move(local_request), allowed));
   shell_->ConnectToApplication(std::move(request),
                                std::move(remote_request),
                                std::move(local_interfaces),
                                params->TakeFilter(),
                                registry->GetConnectToApplicationCallback());
@@ skipping 19 matching lines @@
                                  const mojo::String& url,
                                  uint32_t id) {
   shell_ = std::move(shell);
   shell_.set_connection_error_handler([this]() { OnConnectionError(); });
   client_->Initialize(this, url, id);
 }
 
 void ShellConnection::AcceptConnection(
     const String& requestor_url,
     uint32_t requestor_id,
-    InterfaceRequest<InterfaceProvider> local_interfaces,
-    InterfaceProviderPtr remote_interfaces,
+    shell::mojom::InterfaceProviderRequest local_interfaces,
+    shell::mojom::InterfaceProviderPtr remote_interfaces,
     Array<String> allowed_interfaces,
     const String& url) {
   scoped_ptr<Connection> registry(new internal::ConnectionImpl(
       url, requestor_url, requestor_id, std::move(remote_interfaces),
       std::move(local_interfaces),
       allowed_interfaces.To<std::set<std::string>>()));
   if (!client_->AcceptConnection(registry.get()))
     return;
 
   // If we were quitting because we thought there were no more interfaces for
@@ skipping 43 matching lines @@
 shell::mojom::CapabilityFilterPtr CreatePermissiveCapabilityFilter() {
   shell::mojom::CapabilityFilterPtr filter(
       shell::mojom::CapabilityFilter::New());
   Array<String> all_interfaces;
   all_interfaces.push_back("*");
   filter->filter.insert("*", std::move(all_interfaces));
   return filter;
 }
 
 }  // namespace mojo