Move shell interfaces into the shell.mojom namespace.

mojo/shell/public/cpp/lib/application_test_base.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 <utility>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "mojo/shell/public/interfaces/application.mojom.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
 // Share the application URL with multiple application tests.
 String g_url;
-uint32_t g_id = Shell::kInvalidApplicationID;
+uint32_t g_id = shell::mojom::Shell::kInvalidApplicationID;
 
 // Application request handle passed from the shell in MojoMain, stored in
 // between SetUp()/TearDown() so we can (re-)intialize new ApplicationImpls.
-InterfaceRequest<Application> g_application_request;
+InterfaceRequest<shell::mojom::Application> g_application_request;
 
 // Shell pointer passed in the initial mojo.Application.Initialize() call,
 // stored in between initial setup and the first test and between SetUp/TearDown
 // calls so we can (re-)initialize new ApplicationImpls.
-ShellPtr g_shell;
+shell::mojom::ShellPtr g_shell;
 
-class ShellGrabber : public Application {
+class ShellGrabber : public shell::mojom::Application {
  public:
-  explicit ShellGrabber(InterfaceRequest<Application> application_request)
+  explicit ShellGrabber(
+      InterfaceRequest<shell::mojom::Application> application_request)
       : binding_(this, std::move(application_request)) {}
 
   void WaitForInitialize() {
     // Initialize is always the first call made on Application.
     MOJO_CHECK(binding_.WaitForIncomingMethodCall());
   }
 
  private:
   // Application implementation.
-  void Initialize(ShellPtr shell,
+  void Initialize(shell::mojom::ShellPtr shell,
                   const mojo::String& url,
                   uint32_t id) override {
     g_url = url;
     g_id = id;
     g_application_request = binding_.Unbind();
     g_shell = std::move(shell);
   }
 
   void AcceptConnection(const String& requestor_url,
                         uint32_t requestor_id,
@@ skipping 13 matching lines @@
 
 }  // namespace
 
 MojoResult RunAllTests(MojoHandle application_request_handle) {
   {
     // This loop is used for init, and then destroyed before running tests.
     Environment::InstantiateDefaultRunLoop();
 
     // Grab the shell handle.
     ShellGrabber grabber(
-        MakeRequest<Application>(MakeScopedHandle(
+        MakeRequest<shell::mojom::Application>(MakeScopedHandle(
             MessagePipeHandle(application_request_handle))));
     grabber.WaitForInitialize();
     MOJO_CHECK(g_shell);
     MOJO_CHECK(g_application_request.is_pending());
 
     int argc = 0;
     base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
     const char** argv = new const char* [cmd_line->argv().size() + 1];
 #if defined(OS_WIN)
     std::vector<std::string> local_strings;
@@ skipping 20 matching lines @@
   g_shell.reset();
 
   return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
 }
 
 TestHelper::TestHelper(ApplicationDelegate* delegate)
     : application_impl_(new ApplicationImpl(
           delegate == nullptr ? &default_application_delegate_ : delegate,
           std::move(g_application_request))) {
   // Fake application initialization.
-  Application* application = application_impl_.get();
+  shell::mojom::Application* application = application_impl_.get();
   application->Initialize(std::move(g_shell), g_url, g_id);
 }
 
 TestHelper::~TestHelper() {
   // TODO: commented out until http://crbug.com/533107 is solved.
   // {
   // ApplicationImpl::TestApi test_api(application_impl_);
   // test_api.UnbindConnections(&g_application_request, &g_shell);
   // }
   // We may have supplied a member as the delegate. Delete |application_impl_|
@@ skipping 32 matching lines @@
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo