Update from chromium https://crrev.com/301725/

gpu/command_buffer/service/program_manager_unittest.cc

Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index 5d80694434c47d404fe81ae90968f20ff67bcea1..4acd2209ab8976db160da3f9ea1eeef1899c71af 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -43,9 +43,7 @@ void ShaderCacheCb(const std::string& key, const std::string& shader) {}
 class ProgramManagerTest : public GpuServiceTest {
  public:
   ProgramManagerTest() : manager_(NULL, kMaxVaryingVectors) { }
-  virtual ~ProgramManagerTest() {
-    manager_.Destroy(false);
-  }
+  ~ProgramManagerTest() override { manager_.Destroy(false); }
 
  protected:
   ProgramManager manager_;
@@ -131,7 +129,7 @@ class ProgramManagerWithShaderTest : public GpuServiceTest {
       :  manager_(NULL, kMaxVaryingVectors), program_(NULL) {
   }
 
-  virtual ~ProgramManagerWithShaderTest() {
+  ~ProgramManagerWithShaderTest() override {
     manager_.Destroy(false);
     shader_manager_.Destroy(false);
   }
@@ -172,9 +170,9 @@ class ProgramManagerWithShaderTest : public GpuServiceTest {
   static const GLint kUniform1Size = 1;
   static const GLint kUniform2Size = 3;
   static const GLint kUniform3Size = 2;
-  static const int kUniform1Precision = SH_PRECISION_LOWP;
-  static const int kUniform2Precision = SH_PRECISION_MEDIUMP;
-  static const int kUniform3Precision = SH_PRECISION_HIGHP;
+  static const int kUniform1Precision = GL_LOW_FLOAT;
+  static const int kUniform2Precision = GL_MEDIUM_INT;
+  static const int kUniform3Precision = GL_HIGH_FLOAT;
   static const int kUniform1StaticUse = 1;
   static const int kUniform2StaticUse = 1;
   static const int kUniform3StaticUse = 1;
@@ -215,7 +213,7 @@ class ProgramManagerWithShaderTest : public GpuServiceTest {
     VarCategory category;
   } VarInfo;
 
-  virtual void SetUp() {
+  void SetUp() override {
     GpuServiceTest::SetUp();
 
     SetupDefaultShaderExpectations();
@@ -1130,7 +1128,7 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {
     attrib_map[kAttribs[ii].name] = TestHelper::ConstructAttribute(
         kAttribs[ii].type,
         kAttribs[ii].size,
-        SH_PRECISION_MEDIUMP,
+        GL_MEDIUM_FLOAT,
         kAttribStaticUse,
         kAttribs[ii].name);
   }
@@ -1138,7 +1136,7 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {
   attrib_map[kAttribMatName] = TestHelper::ConstructAttribute(
       GL_FLOAT_MAT2,
       1,
-      SH_PRECISION_MEDIUMP,
+      GL_MEDIUM_FLOAT,
       kAttribStaticUse,
       kAttribMatName);
   // Check we can create shader.
@@ -1579,13 +1577,13 @@ class ProgramManagerWithCacheTest : public GpuServiceTest {
         fragment_shader_(NULL),
         program_(NULL) {
   }
-  virtual ~ProgramManagerWithCacheTest() {
+  ~ProgramManagerWithCacheTest() override {
     manager_.Destroy(false);
     shader_manager_.Destroy(false);
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     GpuServiceTest::SetUp();
 
     vertex_shader_ = shader_manager_.CreateShader(