Destroy all Singletons and LazyInstances between each test.

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 <string.h>
 #include <algorithm>
 
 #include "base/at_exit.h"
 #include "base/logging.h"
 
 namespace {
 
 using gpu::gles2::ShaderTranslator;
 
+static bool g_shader_initalized_ = false;

[Paweł Hajdan Jr., 2013/05/08 16:32:25]

nit: No underscore at the end for global variables.

[Robert Sesek, 2013/05/08 16:42:11]

Done.

+
 void FinalizeShaderTranslator(void* /* dummy */) {
   ShFinalize();
+  g_shader_initalized_ = false;

[Paweł Hajdan Jr., 2013/05/08 16:32:25]

Let's DCHECK before it that g_shader_initialized is true.

[Robert Sesek, 2013/05/08 16:42:11]

Done.

 }
 
 bool InitializeShaderTranslator() {
-  static bool initialized = false;
-  if (!initialized && ShInitialize()) {
+  if (!g_shader_initalized_ && ShInitialize()) {
     base::AtExitManager::RegisterCallback(&FinalizeShaderTranslator, NULL);
-    initialized = true;
+    g_shader_initalized_ = true;
   }
-  return initialized;
+  return g_shader_initalized_;
 }
 
 #if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108
 typedef int ANGLEGetInfoType;
 #else
 typedef size_t ANGLEGetInfoType;
 #endif
 
 void GetVariableInfo(ShHandle compiler, ShShaderInfo var_type,
                      ShaderTranslator::VariableMap* var_map) {
@@ skipping 197 matching lines @@
   translated_shader_.reset();
   info_log_.reset();
   attrib_map_.clear();
   uniform_map_.clear();
   name_map_.clear();
 }
 
 }  // namespace gles2
 }  // namespace gpu