Move shell interfaces into the shell.mojom namespace.

components/pdf_viewer/pdf_viewer.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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 210 matching lines @@
     frame_client_binding_.Bind(std::move(request));
   }
 
   scoped_ptr<mojo::AppRefCount> app_ref_;
   FPDF_DOCUMENT doc_;
   int current_page_;
   int page_count_;
 
   scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_;
 
-  mojo::Shell* shell_;
+  mojo::shell::mojom::Shell* shell_;
   mus::Window* root_;
 
   web_view::mojom::FramePtr frame_;
   mojo::Binding<web_view::mojom::FrameClient> frame_client_binding_;
   DeleteCallback delete_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFView);
 };
 
 // Responsible for managing all the views for displaying a PDF document.
 class PDFViewerApplicationDelegate
     : public mojo::ApplicationDelegate,
       public mojo::InterfaceFactory<mus::mojom::WindowTreeClient> {
  public:
   PDFViewerApplicationDelegate(
-      mojo::InterfaceRequest<mojo::Application> request,
+      mojo::ApplicationRequest request,
       mojo::URLResponsePtr response,
       const mojo::Callback<void()>& destruct_callback)
       : app_(this,
              std::move(request),
              base::Bind(&PDFViewerApplicationDelegate::OnTerminate,
                         base::Unretained(this))),
         doc_(nullptr),
         is_destroying_(false),
         destruct_callback_(destruct_callback) {
     FetchPDF(std::move(response));
@@ skipping 53 matching lines @@
   mojo::ApplicationImpl app_;
   std::string data_;
   std::vector<PDFView*> pdf_views_;
   FPDF_DOCUMENT doc_;
   bool is_destroying_;
   mojo::Callback<void()> destruct_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFViewerApplicationDelegate);
 };
 
-class ContentHandlerImpl : public mojo::ContentHandler {
+class ContentHandlerImpl : public mojo::shell::mojom::ContentHandler {
  public:
-  ContentHandlerImpl(mojo::InterfaceRequest<ContentHandler> request)
+  ContentHandlerImpl(
+      mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler> request)
       : binding_(this, std::move(request)) {}
   ~ContentHandlerImpl() override {}
 
  private:
-  // ContentHandler:
+  // mojo::shell::mojom::ContentHandler:
   void StartApplication(
-      mojo::InterfaceRequest<mojo::Application> request,
+      mojo::ApplicationRequest request,
       mojo::URLResponsePtr response,
       const mojo::Callback<void()>& destruct_callback) override {
     new PDFViewerApplicationDelegate(std::move(request), std::move(response),
                                      destruct_callback);
   }
 
-  mojo::StrongBinding<mojo::ContentHandler> binding_;
+  mojo::StrongBinding<mojo::shell::mojom::ContentHandler> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl);
 };
 
-class PDFViewer : public mojo::ApplicationDelegate,
-                  public mojo::InterfaceFactory<mojo::ContentHandler> {
+class PDFViewer
+    : public mojo::ApplicationDelegate,
+      public mojo::InterfaceFactory<mojo::shell::mojom::ContentHandler> {
  public:
   PDFViewer() {
     v8::V8::InitializeICU();
     FPDF_InitLibrary();
   }
 
   ~PDFViewer() override { FPDF_DestroyLibrary(); }
 
  private:
   // ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override {
     tracing_.Initialize(app);
   }
 
   bool AcceptConnection(
       mojo::ApplicationConnection* connection) override {
     connection->AddService(this);
     return true;
   }
 
   // InterfaceFactory<ContentHandler>:
   void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::ContentHandler> request) override {
+              mojo::InterfaceRequest<mojo::shell::mojom::ContentHandler>
+                  request) override {
     new ContentHandlerImpl(std::move(request));
   }
 
   mojo::TracingImpl tracing_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFViewer);
 };
 }  // namespace
 }  // namespace pdf_viewer
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer());
   return runner.Run(application_request);
 }