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

shell/desktop/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 <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 #include <iostream>
 
@@ skipping 89 matching lines @@
       base::Bind(EndTraceAndFlush, base::Unretained(&flush_complete_event)));
   flush_complete_event.Wait();
 }
 
 }  // namespace
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
-  mojo::shell::InitializeLogging();
+  shell::InitializeLogging();
 
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kHelp) ||
       command_line.GetArgs().empty()) {
     Usage();
     return 0;
   }
 
   const std::set<std::string> all_switches = switches::GetAllSwitches();
@@ skipping 19 matching lines @@
 #if !defined(NDEBUG) || !defined(ENABLE_PROFILING)
     LOG(ERROR) << "Profiling requires is_debug=false and "
                << "enable_profiling=true. Continuing without profiling.";
 // StartProfiling() and StopProfiling() are a no-op.
 #endif
     base::debug::StartProfiling("mojo_shell.pprof");
   }
 
   // We want the shell::Context to outlive the MessageLoop so that pipes are all
   // gracefully closed / error-out before we try to shut the Context down.
-  mojo::shell::Context shell_context;
+  shell::Context shell_context;
   {
     base::MessageLoop message_loop;
     if (!shell_context.Init()) {
       Usage();
       return 1;
     }
     if (g_tracing) {
       message_loop.PostDelayedTask(FROM_HERE,
                                    base::Bind(StopTracingAndFlushToDisk),
                                    base::TimeDelta::FromSeconds(5));
     }
 
     // The mojo_shell --args-for command-line switch is handled specially
     // because it can appear more than once. The base::CommandLine class
     // collapses multiple occurrences of the same switch.
     for (int i = 1; i < argc; i++)
       ApplyApplicationArgs(&shell_context, argv[i]);
 
     message_loop.PostTask(
-        FROM_HERE,
-        base::Bind(&mojo::shell::RunCommandLineApps, &shell_context));
+        FROM_HERE, base::Bind(&shell::RunCommandLineApps, &shell_context));
     message_loop.Run();
 
     // Must be called before |message_loop| is destroyed.
     shell_context.Shutdown();
   }
 
   if (command_line.HasSwitch(switches::kCPUProfile))
     base::debug::StopProfiling();
   if (g_tracing)
     StopTracingAndFlushToDisk();
   return 0;
 }