Move shell interfaces into the shell.mojom namespace.

mojo/shell/fetcher/about_fetcher_unittest.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/fetcher/about_fetcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 13 matching lines @@
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
 class TestContentHandler : public ApplicationDelegate,
-                           public InterfaceFactory<ContentHandler>,
-                           public ContentHandler {
+                           public InterfaceFactory<mojom::ContentHandler>,
+                           public mojom::ContentHandler {
  public:
   TestContentHandler() : response_number_(0) {}
   ~TestContentHandler() override {}
 
   size_t response_number() const { return response_number_; }
   const URLResponse* latest_response() const { return latest_response_.get(); }
 
  private:
   // Overridden from ApplicationDelegate:
   void Initialize(ApplicationImpl* app) override {}
   bool AcceptConnection(ApplicationConnection* connection) override {
-    connection->AddService<ContentHandler>(this);
+    connection->AddService<mojom::ContentHandler>(this);
     return true;
   }
 
-  // Overridden from InterfaceFactory<ContentHandler>:
+  // Overridden from InterfaceFactory<mojom::ContentHandler>:
   void Create(ApplicationConnection* connection,
-              InterfaceRequest<ContentHandler> request) override {
+              InterfaceRequest<mojom::ContentHandler> request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
-  // Overridden from ContentHandler:
+  // Overridden from mojom::ContentHandler:
   void StartApplication(
-      InterfaceRequest<Application> application,
+      InterfaceRequest<mojom::Application> application,
       URLResponsePtr response,
       const Callback<void()>& destruct_callback) override {
     response_number_++;
     latest_response_ = std::move(response);
     destruct_callback.Run();
 
     // Drop |application| request. This results in the application manager
     // dropping the ServiceProvider interface request provided by the client
     // who made the ConnectToApplication() call. Therefore the client could
     // listen for connection error of the ServiceProvider interface to learn
     // that StartApplication() has been called.
   }
 
   size_t response_number_;
   URLResponsePtr latest_response_;
-  WeakBindingSet<ContentHandler> bindings_;
+  WeakBindingSet<mojom::ContentHandler> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
 class TestLoader : public ApplicationLoader {
  public:
   explicit TestLoader(ApplicationDelegate* delegate) : delegate_(delegate) {}
   ~TestLoader() override {}
 
  private:
   // Overridden from ApplicationLoader:
-  void Load(const GURL& url, InterfaceRequest<Application> request) override {
+  void Load(const GURL& url,
+            InterfaceRequest<mojom::Application> request) override {
     app_.reset(new ApplicationImpl(delegate_, std::move(request)));
   }
 
   ApplicationDelegate* delegate_;
   scoped_ptr<ApplicationImpl> app_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLoader);
 };
 
 class AboutFetcherTest : public testing::Test {
@@ skipping 74 matching lines @@
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:some_unrecognized_url", response->url);
   EXPECT_EQ(404u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo