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

ui/aura/bench/bench_main.cc

 // Copyright (c) 2012 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.
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 140 matching lines @@
   WebGLBench(ui::ContextFactory* context_factory,
              Layer* parent,
              Compositor* compositor,
              int max_frames)
       : BenchCompositorObserver(max_frames),
         parent_(parent),
         webgl_(ui::LAYER_SOLID_COLOR),
         compositor_(compositor),
         fbo_(0),
         do_draw_(true) {
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     do_draw_ = !command_line->HasSwitch("disable-draw");
 
     std::string webgl_size = command_line->GetSwitchValueASCII("webgl-size");
     int width = 0;
     int height = 0;
     if (!webgl_size.empty()) {
       std::vector<std::string> split_size;
       base::SplitString(webgl_size, 'x', &split_size);
       if (split_size.size() == 2) {
         width = atoi(split_size[0].c_str());
@@ skipping 84 matching lines @@
 class SoftwareScrollBench : public BenchCompositorObserver {
  public:
   SoftwareScrollBench(ColoredLayer* layer,
                       Compositor* compositor,
                       int max_frames)
       : BenchCompositorObserver(max_frames),
         layer_(layer),
         compositor_(compositor) {
     compositor->AddObserver(this);
     layer_->set_draw(
-        !CommandLine::ForCurrentProcess()->HasSwitch("disable-draw"));
+        !base::CommandLine::ForCurrentProcess()->HasSwitch("disable-draw"));
   }
 
   ~SoftwareScrollBench() override { compositor_->RemoveObserver(this); }
 
   void Draw() override {
     layer_->set_color(
         SkColorSetARGBInline(255*(frames() % kFrames)/kFrames, 255, 0, 255));
     layer_->SchedulePaint(gfx::Rect(layer_->bounds().size()));
   }
 
  private:
   ColoredLayer* layer_;
   Compositor* compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareScrollBench);
 };
 
 }  // namespace
 
 int main(int argc, char** argv) {
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
 
   base::AtExitManager exit_manager;
 
 #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
   gfx::InitializeThreadedX11();
 #endif
 
   gfx::GLSurface::InitializeOneOff();
@@ skipping 24 matching lines @@
   ColoredLayer background(SK_ColorRED);
   background.SetBounds(host->window()->bounds());
   host->window()->layer()->Add(&background);
 
   ColoredLayer window(SK_ColorBLUE);
   window.SetBounds(gfx::Rect(background.bounds().size()));
   background.Add(&window);
 
   Layer content_layer(ui::LAYER_NOT_DRAWN);
 
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   bool force = command_line->HasSwitch("force-render-surface");
   content_layer.SetForceRenderSurface(force);
   gfx::Rect bounds(window.bounds().size());
   bounds.Inset(0, 30, 0, 0);
   content_layer.SetBounds(bounds);
   window.Add(&content_layer);
 
   ColoredLayer page_background(SK_ColorWHITE);
   page_background.SetBounds(gfx::Rect(content_layer.bounds().size()));
   content_layer.Add(&page_background);
@@ skipping 16 matching lines @@
   ui::PrintLayerHierarchy(host->window()->layer(), gfx::Point(100, 100));
 #endif
 
   host->Show();
   base::MessageLoopForUI::current()->Run();
   focus_client.reset();
   host.reset();
 
   return 0;
 }