Update from https://crrev.com/309717

gin/shell/gin_main.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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 39 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GinShellRunnerDelegate);
 };
 
 }  // namespace
 }  // namespace gin
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   base::i18n::InitializeICU();
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
   gin::IsolateHolder::LoadV8Snapshot();
 #endif
 
   gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode,
                                  gin::ArrayBufferAllocator::SharedInstance());
   gin::IsolateHolder instance;
 
   base::MessageLoop message_loop;
 
   gin::GinShellRunnerDelegate delegate;
   gin::ShellRunner runner(&delegate, instance.isolate());
 
   {
     gin::Runner::Scope scope(&runner);
     v8::V8::SetCaptureStackTraceForUncaughtExceptions(true);
   }
 
-  CommandLine::StringVector args = CommandLine::ForCurrentProcess()->GetArgs();
-  for (CommandLine::StringVector::const_iterator it = args.begin();
+  base::CommandLine::StringVector args =
+      base::CommandLine::ForCurrentProcess()->GetArgs();
+  for (base::CommandLine::StringVector::const_iterator it = args.begin();
        it != args.end(); ++it) {
     base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
         gin::Run, runner.GetWeakPtr(), base::FilePath(*it)));
   }
 
   message_loop.RunUntilIdle();
   return 0;
 }