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

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.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 "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
@@ skipping 184 matching lines @@
     window_title_->SetVisible(delegate_->ShouldShowWindowTitle());
     window_title_->SetEnabledColor(SK_ColorWHITE);
     window_title_->SetSubpixelRenderingEnabled(false);
     window_title_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     window_title_->set_id(VIEW_ID_WINDOW_TITLE);
     root_view_->AddChildView(window_title_);
   }
 
   void AddAvatarButton() {
     // Disable the New Avatar Menu.
-    switches::DisableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+    switches::DisableNewAvatarMenuForTesting(
+        base::CommandLine::ForCurrentProcess());
 
     menu_button_ = new AvatarMenuButton(nullptr, false);
     menu_button_->set_id(VIEW_ID_AVATAR_BUTTON);
     delegate_->SetShouldShowAvatar(true);
     root_view_->AddChildView(menu_button_);
   }
 
 #if defined(ENABLE_SUPERVISED_USERS)
   void AddSupervisedUserAvatarLabel() {
     supervised_user_avatar_label_ = new SupervisedUserAvatarLabel(nullptr);
     supervised_user_avatar_label_->set_id(VIEW_ID_SUPERVISED_USER_AVATAR_LABEL);
     root_view_->AddChildView(supervised_user_avatar_label_);
 
     // The avatar label should only be used together with the avatar button.
     AddAvatarButton();
   }
 #endif
 
   void AddNewAvatarButton() {
     // Enable the New Avatar Menu.
-    switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
+    switches::EnableNewAvatarMenuForTesting(
+        base::CommandLine::ForCurrentProcess());
 
     new_avatar_button_ =
         new views::MenuButton(nullptr, base::string16(), nullptr, false);
     new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);
     root_view_->AddChildView(new_avatar_button_);
   }
 
   void ExpectBasicWindowBounds() {
     EXPECT_EQ("428,1 25x18", maximize_button_->bounds().ToString());
     EXPECT_EQ("402,1 26x18", minimize_button_->bounds().ToString());
@@ skipping 305 matching lines @@
   // both are displayed on the left side.
   // The label height and width depends on the font size and the text displayed.
   // This may possibly change, so we don't test it here.
   EXPECT_EQ(menu_button_->bounds().x() - 2,
             supervised_user_avatar_label_->bounds().x());
   EXPECT_EQ(menu_button_->bounds().bottom() - 3 -
             supervised_user_avatar_label_->bounds().height(),
             supervised_user_avatar_label_->bounds().y());
 }
 #endif