Move shell interfaces into the shell.mojom namespace.

components/font_service/public/cpp/font_loader.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/font_service/public/cpp/font_loader.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
 #include "components/font_service/public/cpp/font_service_thread.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/connect.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace font_service {
 namespace {
 void OnGotRemoteIDs(uint32_t instance_id, uint32_t content_handler_id) {}
 }  // namespace
 
-FontLoader::FontLoader(mojo::Shell* shell) {
+FontLoader::FontLoader(mojo::shell::mojom::Shell* shell) {
   mojo::ServiceProviderPtr font_service_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:font_service");
   FontServicePtr font_service;
   shell->ConnectToApplication(std::move(request),
                               GetProxy(&font_service_provider), nullptr,
                               mojo::CreatePermissiveCapabilityFilter(),
                               base::Bind(&OnGotRemoteIDs));
   mojo::ConnectToService(font_service_provider.get(), &font_service);
 
@@ skipping 55 matching lines @@
 }
 
 void FontLoader::OnMappedFontFileDestroyed(internal::MappedFontFile* f) {
   TRACE_EVENT1("font_loader", "FontLoader::OnMappedFontFileDestroyed",
                "identity", f->font_id());
   base::AutoLock lock(lock_);
   mapped_font_files_.erase(f->font_id());
 }
 
 }  // namespace font_service