Update from https://crrev.com/309717

skia/ext/vector_canvas_unittest.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.
 
 #include "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 400 matching lines @@
 
     Image image1(*vcanvas_);
     Image image2(*pcanvas_);
     double diff = image1.PercentageDifferent(image2);
     return std::max(std::max(diff1, diff2), diff);
   }
 
   // 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.
   int size_;
 
   // Current image number in the current test. Used to number of test files.
   int number_;
 
   // A temporary HDC to draw into.
   Context* context_;
@@ skipping 527 matching lines @@
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
 #endif  // !defined(USE_AURA)
 
 }  // namespace skia