Move runner stuff into a runner namespace.

mojo/runner/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 "mojo/runner/native_application_support.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_thunks.h"
 #include "mojo/public/platform/native/gles2_thunks.h"
 #include "mojo/public/platform/native/system_thunks.h"
 
 namespace mojo {
-namespace shell {
+namespace runner {
 
 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>(
       base::GetFunctionPointerFromNativeLibrary(library, function_name));
   if (!set_thunks)
     return false;
   Thunks thunks = make_thunks();
   size_t expected_size = set_thunks(&thunks);
   if (expected_size > sizeof(Thunks)) {
     LOG(ERROR) << "Invalid app library: expected " << function_name
                << " to return thunks of size: " << expected_size;
     return false;
   }
   return true;
 }
 
 }  // namespace
 
-base::NativeLibrary LoadNativeApplication(const base::FilePath& app_path,
-                                          NativeApplicationCleanup cleanup) {
+base::NativeLibrary LoadNativeApplication(
+    const base::FilePath& app_path,
+    shell::NativeApplicationCleanup cleanup) {
   DVLOG(2) << "Loading Mojo app in process from library: " << app_path.value();
 
   base::NativeLibraryLoadError error;
   base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
-  if (cleanup == NativeApplicationCleanup::DELETE)
+  if (cleanup == shell::NativeApplicationCleanup::DELETE)
     DeleteFile(app_path, false);
   LOG_IF(ERROR, !app_library)
       << "Failed to load app library (error: " << error.ToString() << ")";
   return app_library;
 }
 
 bool RunNativeApplication(base::NativeLibrary app_library,
                           InterfaceRequest<Application> application_request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
@@ skipping 71 matching lines @@
   }
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = application_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 runner
 }  // namespace mojo