Cleanup: Use base::CommandLine in mojo/

mojo/shell/android/mojo_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 "mojo/shell/android/mojo_main.h"
 
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 LazyInstance<scoped_ptr<base::MessageLoop> > g_java_message_loop =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<shell::Context> > g_context =
     LAZY_INSTANCE_INITIALIZER;
 
 
 LazyInstance<scoped_ptr<mojo::Environment> > g_env =
     LAZY_INSTANCE_INITIALIZER;
 
-}  // namspace
+}  // namespace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
 
   base::android::InitApplicationContext(env, scoped_context);
 
-  CommandLine::Init(0, 0);
+  base::CommandLine::Init(0, 0);
   mojo::shell::InitializeLogging();
 
   g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
   // TODO(abarth): At which point should we switch to cross-platform
   // initialization?
 
   gfx::GLSurface::InitializeOneOff();
 }
 
 static void Start(JNIEnv* env, jclass clazz, jobject context, jstring jurl) {
   std::string app_url;
 #if defined(MOJO_SHELL_DEBUG_URL)
   app_url = MOJO_SHELL_DEBUG_URL;
   // Sleep for 5 seconds to give the debugger a chance to attach.
   sleep(5);
 #else
   if (jurl)
     app_url = base::android::ConvertJavaStringToUTF8(env, jurl);
 #endif
   if (!app_url.empty()) {
     std::vector<std::string> argv;
     argv.push_back("mojo_shell");
     argv.push_back(app_url);
-    CommandLine::ForCurrentProcess()->InitFromArgv(argv);
+    base::CommandLine::ForCurrentProcess()->InitFromArgv(argv);
   }
 
   g_env.Get().reset(new Environment);
 
   base::android::ScopedJavaGlobalRef<jobject> activity;
   activity.Reset(env, context);
 
   shell::Context* shell_context = new shell::Context();
   shell_context->set_activity(activity.obj());
 
   g_context.Get().reset(shell_context);
   shell::Run(shell_context);
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace mojo