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

content/shell/browser/webkit_test_controller.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 "content/shell/browser/webkit_test_controller.h"
 
 #include <iostream>
 
 #include "base/base64.h"
 #include "base/command_line.h"
@@ skipping 184 matching lines @@
 
 // static
 WebKitTestController* WebKitTestController::Get() {
   DCHECK(instance_);
   return instance_;
 }
 
 WebKitTestController::WebKitTestController()
     : main_window_(NULL),
       test_phase_(BETWEEN_TESTS),
-      is_leak_detection_enabled_(CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableLeakDetection)),
+      is_leak_detection_enabled_(
+          base::CommandLine::ForCurrentProcess()->HasSwitch(
+              switches::kEnableLeakDetection)),
       crash_when_leak_found_(false) {
   CHECK(!instance_);
   instance_ = this;
 
   if (is_leak_detection_enabled_) {
     std::string switchValue =
-        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kEnableLeakDetection);
     crash_when_leak_found_ = switchValue == switches::kCrashOnFailure;
   }
 
   printer_.reset(new WebKitTestResultPrinter(&std::cout, &std::cerr));
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEncodeBinary))
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEncodeBinary))
     printer_->set_encode_binary_data(true);
   registrar_.Add(this,
                  NOTIFICATION_RENDERER_PROCESS_CREATED,
                  NotificationService::AllSources());
   GpuDataManager::GetInstance()->AddObserver(this);
   ResetAfterLayoutTest();
 }
 
 WebKitTestController::~WebKitTestController() {
   DCHECK(CalledOnValidThread());
@@ skipping 98 matching lines @@
   printer_->AddErrorMessage("#CRASHED - worker");
   DiscardMainWindow();
 }
 
 void WebKitTestController::OverrideWebkitPrefs(WebPreferences* prefs) {
   if (should_override_prefs_) {
     *prefs = prefs_;
   } else {
     ApplyLayoutTestDefaultPreferences(prefs);
     if (is_compositing_test_) {
-      CommandLine& command_line = *CommandLine::ForCurrentProcess();
+      base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
       if (!command_line.HasSwitch(switches::kDisableGpu))
         prefs->accelerated_2d_canvas_enabled = true;
       prefs->mock_scrollbars_enabled = true;
     }
   }
 }
 
 void WebKitTestController::OpenURL(const GURL& url) {
   if (test_phase_ != DURING_TEST)
     return;
@@ skipping 140 matching lines @@
 }
 
 void WebKitTestController::SendTestConfiguration() {
   RenderViewHost* render_view_host =
       main_window_->web_contents()->GetRenderViewHost();
   ShellTestConfiguration params;
   params.current_working_directory = current_working_directory_;
   params.temp_path = temp_path_;
   params.test_url = test_url_;
   params.enable_pixel_dumping = enable_pixel_dumping_;
-  params.allow_external_pages = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAllowExternalPages);
+  params.allow_external_pages =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAllowExternalPages);
   params.expected_pixel_hash = expected_pixel_hash_;
   params.initial_size = initial_size_;
   render_view_host->Send(new ShellViewMsg_SetTestConfiguration(
       render_view_host->GetRoutingID(), params));
 }
 
 void WebKitTestController::OnTestFinished() {
   test_phase_ = CLEAN_UP;
   if (!printer_->output_finished())
     printer_->PrintImageFooter();
@@ skipping 12 matching lines @@
   SkAutoLockPixels image_lock(image);
 
   printer_->PrintImageHeader(actual_pixel_hash, expected_pixel_hash_);
 
   // Only encode and dump the png if the hashes don't match. Encoding the
   // image is really expensive.
   if (actual_pixel_hash != expected_pixel_hash_) {
     std::vector<unsigned char> png;
 
     bool discard_transparency = true;
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableOverlayFullscreenVideo))
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableOverlayFullscreenVideo))
       discard_transparency = false;
 
     std::vector<gfx::PNGCodec::Comment> comments;
     comments.push_back(gfx::PNGCodec::Comment("checksum", actual_pixel_hash));
     bool success = gfx::PNGCodec::Encode(
         static_cast<const unsigned char*>(image.getPixels()),
         gfx::PNGCodec::FORMAT_BGRA,
         gfx::Size(image.width(), image.height()),
         static_cast<int>(image.rowBytes()),
         discard_transparency,
@@ skipping 137 matching lines @@
 
   printer_->AddErrorMessage(
       base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_,
                          result.detail.c_str()));
   CHECK(!crash_when_leak_found_);
 
   DiscardMainWindow();
 }
 
 }  // namespace content