Update from https://crrev.com/309717

gpu/config/gpu_driver_bug_list.cc

 // Copyright (c) 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 "gpu/config/gpu_driver_bug_list.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 
@@ skipping 37 matching lines @@
 std::string GpuDriverBugWorkaroundTypeToString(
     GpuDriverBugWorkaroundType type) {
   if (type < NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES)
     return kFeatureList[type].name;
   else
     return "unknown";
 }
 
 // static
 void GpuDriverBugList::AppendWorkaroundsFromCommandLine(
-    std::set<int>* workarounds, const CommandLine& command_line) {
+    std::set<int>* workarounds,
+    const base::CommandLine& command_line) {
   DCHECK(workarounds);
   for (int i = 0; i < NUMBER_OF_GPU_DRIVER_BUG_WORKAROUND_TYPES; i++) {
     if (!command_line.HasSwitch(kFeatureList[i].name))
       continue;
     // Removing conflicting workarounds.
     switch (kFeatureList[i].type) {
       case FORCE_DISCRETE_GPU:
         workarounds->erase(FORCE_INTEGRATED_GPU);
         workarounds->insert(FORCE_DISCRETE_GPU);
         break;
@@ skipping 11 matching lines @@
         break;
       default:
         workarounds->insert(kFeatureList[i].type);
         break;
     }
   }
 }
 
 }  // namespace gpu