Update from https://crrev.com/315085

gpu/command_buffer/service/shader_manager_unittest.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_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "gpu/command_buffer/service/test_helper.h"
@@ skipping 109 matching lines @@
       kClient1Id, kService1Id, kShader1Type);
   // Check shader got created.
   ASSERT_TRUE(shader1 != NULL);
   EXPECT_EQ(kService1Id, shader1->service_id());
   // Check if the shader has correct type.
   EXPECT_EQ(kShader1Type, shader1->shader_type());
   EXPECT_FALSE(shader1->valid());
   EXPECT_FALSE(shader1->InUse());
   EXPECT_TRUE(shader1->source().empty());
   EXPECT_TRUE(shader1->log_info().empty());
-  EXPECT_TRUE(shader1->signature_source().empty());
+  EXPECT_TRUE(shader1->last_compiled_source().empty());
   EXPECT_TRUE(shader1->translated_source().empty());
   EXPECT_EQ(0u, shader1->attrib_map().size());
   EXPECT_EQ(0u, shader1->uniform_map().size());
   EXPECT_EQ(0u, shader1->varying_map().size());
+  EXPECT_EQ(Shader::kShaderStateWaiting, shader1->shader_state());
 
   // Check we can set its source.
   shader1->set_source(kClient1Source);
   EXPECT_STREQ(kClient1Source, shader1->source().c_str());
-  EXPECT_TRUE(shader1->signature_source().empty());
+  EXPECT_TRUE(shader1->last_compiled_source().empty());
+
+  // Check that DoCompile() will not work if RequestCompile() was not called.
+  MockShaderTranslator translator;
+  shader1->DoCompile(&translator, Shader::kANGLE);
+  EXPECT_EQ(Shader::kShaderStateWaiting, shader1->shader_state());
+  EXPECT_FALSE(shader1->valid());
+
+  // Check RequestCompile() will update the state and last compiled source, but
+  // still keep the actual compile state invalid.
+  shader1->RequestCompile();
+  EXPECT_EQ(Shader::kShaderStateCompileRequested, shader1->shader_state());
+  EXPECT_STREQ(kClient1Source, shader1->last_compiled_source().c_str());
+  EXPECT_FALSE(shader1->valid());
 
   // Check DoCompile() will set compilation states, log, translated source,
   // shader variables, and name mapping.
   const std::string kLog = "foo";
   const std::string kTranslatedSource = "poo";
 
   AttributeMap attrib_map;
   attrib_map[kAttrib1Name] = TestHelper::ConstructAttribute(
       kAttrib1Type, kAttrib1Size, kAttrib1Precision,
       kAttribStaticUse, kAttrib1Name);
@@ skipping 11 matching lines @@
   varying_map[kVarying1Name] = TestHelper::ConstructVarying(
       kVarying1Type, kVarying1Size, kVarying1Precision,
       kVarying1StaticUse, kVarying1Name);
 
   TestHelper::SetShaderStates(
       gl_.get(), shader1, true, &kLog, &kTranslatedSource,
       &attrib_map, &uniform_map, &varying_map, NULL);
   EXPECT_TRUE(shader1->valid());
   // When compilation succeeds, no log is recorded.
   EXPECT_STREQ("", shader1->log_info().c_str());
-  EXPECT_STREQ(kClient1Source, shader1->signature_source().c_str());
+  EXPECT_STREQ(kClient1Source, shader1->last_compiled_source().c_str());
   EXPECT_STREQ(kTranslatedSource.c_str(), shader1->translated_source().c_str());
 
   // Check varying infos got copied.
   EXPECT_EQ(attrib_map.size(), shader1->attrib_map().size());
   for (AttributeMap::const_iterator it = attrib_map.begin();
        it != attrib_map.end(); ++it) {
     const sh::Attribute* variable_info = shader1->GetAttribInfo(it->first);
     ASSERT_TRUE(variable_info != NULL);
     EXPECT_EQ(it->second.type, variable_info->type);
     EXPECT_EQ(it->second.arraySize, variable_info->arraySize);
@@ skipping 76 matching lines @@
   EXPECT_FALSE(shader1->InUse());
   shader2 = manager_.GetShader(kClient1Id);
   EXPECT_EQ(shader1, shader2);
   manager_.MarkAsDeleted(shader1);  // this should delete the shader.
   shader2 = manager_.GetShader(kClient1Id);
   EXPECT_TRUE(shader2 == NULL);
 }
 
 }  // namespace gles2
 }  // namespace gpu