Make callers of CommandLine use it via the base:: namespace.

ui/ozone/demo/ozone_demo.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 15 matching lines @@
 
 const char kDisableGpu[] = "disable-gpu";
 
 const char kWindowSize[] = "window-size";
 
 class DemoWindow : public ui::PlatformWindowDelegate {
  public:
   DemoWindow() : widget_(gfx::kNullAcceleratedWidget) {
     int width = kTestWindowWidth;
     int height = kTestWindowHeight;
-    sscanf(CommandLine::ForCurrentProcess()
+    sscanf(base::CommandLine::ForCurrentProcess()
                ->GetSwitchValueASCII(kWindowSize)
                .c_str(),
            "%dx%d", &width, &height);
 
     platform_window_ = ui::OzonePlatform::GetInstance()->CreatePlatformWindow(
         this, gfx::Rect(width, height));
   }
   ~DemoWindow() override {}
 
   gfx::AcceleratedWidget GetAcceleratedWidget() {
     // TODO(spang): We should start rendering asynchronously.
     DCHECK_NE(widget_, gfx::kNullAcceleratedWidget)
         << "Widget not available synchronously";
     return widget_;
   }
 
   gfx::Size GetSize() { return platform_window_->GetBounds().size(); }
 
   void Start() {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(kDisableGpu) &&
+    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(kDisableGpu) &&
         gfx::GLSurface::InitializeOneOff() && StartInProcessGpu()) {
-      if (CommandLine::ForCurrentProcess()->HasSwitch(
+      if (base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kOzoneUseSurfaceless)) {
         renderer_.reset(
             new ui::SurfacelessGlRenderer(GetAcceleratedWidget(), GetSize()));
       } else {
         renderer_.reset(new ui::GlRenderer(GetAcceleratedWidget(), GetSize()));
       }
     } else {
       renderer_.reset(
           new ui::SoftwareRenderer(GetAcceleratedWidget(), GetSize()));
     }
@@ skipping 43 matching lines @@
   scoped_ptr<ui::PlatformWindow> platform_window_;
   gfx::AcceleratedWidget widget_;
 
   // Helper for applications that do GL on main thread.
   ui::UiThreadGpu ui_thread_gpu_;
 
   DISALLOW_COPY_AND_ASSIGN(DemoWindow);
 };
 
 int main(int argc, char** argv) {
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   base::AtExitManager exit_manager;
 
   // Build UI thread message loop. This is used by platform
   // implementations for event polling & running background tasks.
   base::MessageLoopForUI message_loop;
 
   ui::OzonePlatform::InitializeForUI();
 
   DemoWindow* window = new DemoWindow;
   window->Start();
 
   // Run the message loop until there's nothing left to do.
   // TODO(spang): Should we use QuitClosure instead?
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 
   return 0;
 }