Move shell service to toplevel shell namespace

services/shell/runner/host/native_application_support.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 "services/shell/runner/host/native_application_support.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "mojo/platform_handle/platform_handle_private_thunks.h"
 #include "mojo/public/platform/native/system_thunks.h"
 
-namespace mojo {
 namespace shell {
 
 namespace {
 
 template <typename Thunks>
 bool SetThunks(Thunks (*make_thunks)(),
                const char* function_name,
                base::NativeLibrary library) {
   typedef size_t (*SetThunksFn)(const Thunks* thunks);
   SetThunksFn set_thunks = reinterpret_cast<SetThunksFn>(
@@ skipping 15 matching lines @@
 base::NativeLibrary LoadNativeApplication(const base::FilePath& app_path) {
   DVLOG(2) << "Loading Mojo app in process from library: " << app_path.value();
 
   base::NativeLibraryLoadError error;
   base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
   LOG_IF(ERROR, !app_library)
       << "Failed to load app library (path: " << app_path.value() << ")";
   return app_library;
 }
 
-bool RunNativeApplication(
-    base::NativeLibrary app_library,
-    InterfaceRequest<mojom::ShellClient> request) {
+bool RunNativeApplication(base::NativeLibrary app_library,
+                          mojom::ShellClientRequest request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
 
 // Thunks aren't needed/used in component build, since the thunked methods
 // just live in their own dynamically loaded library.
 #if !defined(COMPONENT_BUILD)
   if (!SetThunks(&MojoMakeSystemThunks, "MojoSetSystemThunks", app_library)) {
     LOG(ERROR) << "MojoSetSystemThunks not found";
     return false;
@@ skipping 34 matching lines @@
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result != MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";
   }
   return true;
 }
 
 }  // namespace shell
-}  // namespace mojo