gpu: Fix dependency cycle between service_sources and config_sources.

gpu/command_buffer/service/gpu_switches.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/command_buffer/service/gpu_switches.h"
-#include "base/basictypes.h"
+
+#include "base/macros.h"
 
 namespace switches {
 
 // Always return success when compiling a shader. Linking will still fail.
 const char kCompileShaderAlwaysSucceeds[]   = "compile-shader-always-succeeds";
 
 // Disable the GL error log limit.
 const char kDisableGLErrorLimit[]           = "disable-gl-error-limit";
 
 // Disable the GLSL translator.
@@ skipping 19 matching lines @@
 
 // Turn off gpu program caching
 const char kDisableGpuProgramCache[]        = "disable-gpu-program-cache";
 
 // Enforce GL minimums.
 const char kEnforceGLMinimums[]             = "enforce-gl-minimums";
 
 // Sets the total amount of memory that may be allocated for GPU resources
 const char kForceGpuMemAvailableMb[]        = "force-gpu-mem-available-mb";
 
-// Pass a set of GpuDriverBugWorkaroundType ids, seperated by ','.
-const char kGpuDriverBugWorkarounds[] = "gpu-driver-bug-workarounds";
-
 // Sets the maximum size of the in-memory gpu program cache, in kb
 const char kGpuProgramCacheSizeKb[]         = "gpu-program-cache-size-kb";
 
 // Disables the GPU shader on disk cache.
 const char kDisableGpuShaderDiskCache[]     = "disable-gpu-shader-disk-cache";
 
 // Allows async texture uploads (off main thread) via GL context sharing.
 const char kEnableShareGroupAsyncTextureUpload[] =
     "enable-share-group-async-texture-upload";
 
@@ skipping 31 matching lines @@
   kDisableGpuShaderDiskCache,
   kEnableShareGroupAsyncTextureUpload,
   kEnableSubscribeUniformExtension,
   kGLShaderIntermOutput,
   kEmulateShaderPrecision,
 };
 
 const int kNumGpuSwitches = arraysize(kGpuSwitches);
 
 }  // namespace switches