Update from https://crrev.com/309717

skia/ext/vector_canvas_unittest.cc

Index: skia/ext/vector_canvas_unittest.cc
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 8785cb4af45ae731a215746e6f9d73598b6cc34a..a52c7b6a53557212316a2a92fb8c0b7683caf6bb 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -418,8 +418,9 @@ class VectorCanvasTest : public ImageTest {
   // Returns COMPARE, which is the default. If kGenerateSwitch command
   // line argument is used to start this process, GENERATE is returned instead.
   static ProcessAction CurrentMode() {
-    return CommandLine::ForCurrentProcess()->HasSwitch(kGenerateSwitch) ?
-               GENERATE : COMPARE;
+    return base::CommandLine::ForCurrentProcess()->HasSwitch(kGenerateSwitch)
+               ? GENERATE
+               : COMPARE;
   }
 
   // Length in x and y of the square canvas.