Pull in various gpu/command_buffer fixes from chromium

gpu/config/gpu_util.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 "gpu/config/gpu_util.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/config/gpu_control_list_jsons.h"
 #include "gpu/config/gpu_driver_bug_list.h"
 #include "gpu/config/gpu_info_collector.h"
+#include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 
 namespace gpu {
 
 namespace {
 
 // Combine the integers into a string, seperated by ','.
 std::string IntSetToString(const std::set<int>& list) {
   std::string rt;
   for (std::set<int>::const_iterator it = list.begin();
@@ skipping 47 matching lines @@
                                     IntSetToString(workarounds));
   }
 }
 
 void StringToFeatureSet(
     const std::string& str, std::set<int>* feature_set) {
   StringToIntSet(str, feature_set);
 }
 
 }  // namespace gpu