Remove mojo:: part of mojo::shell:: nested namespace in //shell.

shell/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 "shell/native_application_support.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_impl_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 18 matching lines @@
 
   base::NativeLibraryLoadError error;
   base::NativeLibrary app_library = base::LoadNativeLibrary(app_path, &error);
   if (cleanup == 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) {
+bool RunNativeApplication(
+    base::NativeLibrary app_library,
+    mojo::InterfaceRequest<mojo::Application> application_request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
 
   if (!SetThunks(&MojoMakeSystemThunks, "MojoSetSystemThunks", app_library)) {
     LOG(ERROR) << "MojoSetSystemThunks not found";
     return false;
   }
 
   // TODO(ncbray): enforce the private nature of this API, somehow?
@@ skipping 49 matching lines @@
   }
   // |MojoMain()| takes ownership of the service handle.
   MojoHandle handle = application_request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   LOG_IF(ERROR, result != MOJO_RESULT_OK)
       << "MojoMain returned error (result: " << result << ")";
   return true;
 }
 
 }  // namespace shell
-}  // namespace mojo