Update from https://crrev.com/309717

ui/gfx/display.cc

Index: ui/gfx/display.cc
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
index 029359c09382811854da4bd0772d1b5205c1334c..d9c837e02b36fb8250edde77141c320676bcaae2 100644
--- a/ui/gfx/display.cc
+++ b/ui/gfx/display.cc
@@ -20,14 +20,14 @@ namespace gfx {
 namespace {
 
 bool HasForceDeviceScaleFactorImpl() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kForceDeviceScaleFactor);
 }
 
 float GetForcedDeviceScaleFactorImpl() {
   double scale_in_double = 1.0;
   if (HasForceDeviceScaleFactorImpl()) {
-    std::string value = CommandLine::ForCurrentProcess()->
+    std::string value = base::CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kForceDeviceScaleFactor);
     if (!base::StringToDouble(value, &scale_in_double))
       LOG(ERROR) << "Failed to parse the default device scale factor:" << value;