Move shell interfaces into the shell.mojom namespace.

components/web_view/frame_connection.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 "components/web_view/frame_connection.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 56 matching lines @@
   connection->Init(app, std::move(request),
                    base::Bind(&OnGotContentHandlerForFrame, frame->app_id(),
                               callback, base::Passed(&frame_connection)));
 }
 
 void FrameConnection::Init(mojo::ApplicationImpl* app,
                            mojo::URLRequestPtr request,
                            const base::Closure& on_got_id_callback) {
   DCHECK(!application_connection_);
 
-  mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New());
+  mojo::shell::mojom::CapabilityFilterPtr filter(
+      mojo::shell::mojom::CapabilityFilter::New());
   mojo::Array<mojo::String> resource_provider_interfaces;
   resource_provider_interfaces.push_back(
       resource_provider::ResourceProvider::Name_);
   filter->filter.insert("mojo:resource_provider",
                         std::move(resource_provider_interfaces));
 
   mojo::Array<mojo::String> network_service_interfaces;
   network_service_interfaces.push_back(mojo::CookieStore::Name_);
   network_service_interfaces.push_back(mojo::NetworkService::Name_);
   network_service_interfaces.push_back(mojo::URLLoaderFactory::Name_);
@@ skipping 36 matching lines @@
 }
 
 mus::mojom::WindowTreeClientPtr FrameConnection::GetWindowTreeClient() {
   DCHECK(application_connection_);
   mus::mojom::WindowTreeClientPtr window_tree_client;
   application_connection_->ConnectToService(&window_tree_client);
   return window_tree_client;
 }
 
 uint32_t FrameConnection::GetContentHandlerID() const {
-  uint32_t content_handler_id = mojo::Shell::kInvalidApplicationID;
+  uint32_t content_handler_id =
+      mojo::shell::mojom::Shell::kInvalidApplicationID;
   if (!application_connection_->GetRemoteContentHandlerID(&content_handler_id))
     NOTREACHED();
   return content_handler_id;
 }
 
 }  // namespace web_view