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

shell/android/main.cc

 // Copyright 2013 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/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 15 matching lines @@
 #include "shell/android/native_viewport_application_loader.h"
 #include "shell/android/ui_application_loader_android.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/command_line_util.h"
 #include "shell/context.h"
 #include "shell/init.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
 
-namespace mojo {
 namespace shell {
 
 namespace {
 
 // Tag for logging.
 const char kLogTag[] = "chromium";
 
 // Command line argument for the communication fifo.
 const char kFifoPath[] = "fifo-path";
 
@@ skipping 54 matching lines @@
 
 void QuitShellThread() {
   g_shell_thread.Get()->Join();
   g_shell_thread.Pointer()->reset();
   Java_ShellMain_finishActivity(base::android::AttachCurrentThread(),
                                 g_main_activiy.Get().obj());
   exit(0);
 }
 
 void MojoShellRunner::Run() {
-  base::MessageLoop loop(common::MessagePumpMojo::Create());
+  base::MessageLoop loop(mojo::common::MessagePumpMojo::Create());
   Context* context = g_context.Pointer()->get();
   ConfigureAndroidServices(context);
   context->InitWithPaths(mojo_shell_path_, mojo_shell_child_path_);
 
   for (const auto& args : parameters_)
     ApplyApplicationArgs(context, args);
 
   RunCommandLineApps(context);
   loop.Run();
 
@@ skipping 96 matching lines @@
 static void AddApplicationURL(JNIEnv* env, jclass clazz, jstring jurl) {
   base::CommandLine::ForCurrentProcess()->AppendArg(
       base::android::ConvertJavaStringToUTF8(env, jurl));
 }
 
 bool RegisterShellMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell
-}  // namespace mojo
 
 // TODO(vtl): We need a main(), even though it should never be called.
 int main(int argc, char** argv) {
   NOTREACHED();
   return 1;
 }