Use GpuPreferences to avoid directly accessing switches in gpu related code

gpu/command_buffer/service/shader_translator.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/shader_translator.h"
 
 #include <GLES2/gl2.h>
 #include <stddef.h>
 #include <string.h>
 #include <algorithm>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/trace_event/trace_event.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_version_info.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 class ShaderTranslatorInitializer {
  public:
@@ skipping 126 matching lines @@
 }
 
 ShaderTranslator::DestructionObserver::DestructionObserver() {
 }
 
 ShaderTranslator::DestructionObserver::~DestructionObserver() {
 }
 
 ShaderTranslator::ShaderTranslator()
     : compiler_(NULL),
-      driver_bug_workarounds_(static_cast<ShCompileOptions>(0)) {
+      driver_bug_workarounds_(static_cast<ShCompileOptions>(0)),
+      gl_shader_interm_output_(false) {
 }
 
 bool ShaderTranslator::Init(GLenum shader_type,
                             ShShaderSpec shader_spec,
                             const ShBuiltInResources* resources,
                             ShShaderOutput shader_output_language,
-                            ShCompileOptions driver_bug_workarounds) {
+                            ShCompileOptions driver_bug_workarounds,
+                            bool gl_shader_interm_output) {
   // Make sure Init is called only once.
   DCHECK(compiler_ == NULL);
   DCHECK(shader_type == GL_FRAGMENT_SHADER || shader_type == GL_VERTEX_SHADER);
   DCHECK(shader_spec == SH_GLES2_SPEC || shader_spec == SH_WEBGL_SPEC ||
          shader_spec == SH_GLES3_SPEC || shader_spec == SH_WEBGL2_SPEC);
   DCHECK(resources != NULL);
 
   g_translator_initializer.Get();
 
 
   {
     TRACE_EVENT0("gpu", "ShConstructCompiler");
     compiler_ = ShConstructCompiler(shader_type, shader_spec,
                                     shader_output_language, resources);
   }
   driver_bug_workarounds_ = driver_bug_workarounds;
+  gl_shader_interm_output_ = gl_shader_interm_output;
   return compiler_ != NULL;
 }
 
 int ShaderTranslator::GetCompileOptions() const {
   int compile_options =
       SH_OBJECT_CODE | SH_VARIABLES | SH_ENFORCE_PACKING_RESTRICTIONS |
       SH_LIMIT_EXPRESSION_COMPLEXITY | SH_LIMIT_CALL_STACK_DEPTH |
       SH_CLAMP_INDIRECT_ARRAY_BOUNDS;
 
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kGLShaderIntermOutput))
+  if (gl_shader_interm_output_)
     compile_options |= SH_INTERMEDIATE_TREE;
 
   compile_options |= driver_bug_workarounds_;
 
   return compile_options;
 }
 
 bool ShaderTranslator::Translate(const std::string& shader_source,
                                  std::string* info_log,
                                  std::string* translated_source,
@@ skipping 65 matching lines @@
                     destruction_observers_,
                     OnDestruct(this));
 
   if (compiler_ != NULL)
     ShDestruct(compiler_);
 }
 
 }  // namespace gles2
 }  // namespace gpu