Update from https://crrev.com/315085

gpu/command_buffer/service/feature_info.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/feature_info.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_implementation.h"
 
+#if !defined(OS_MACOSX)
+#include "ui/gl/gl_fence_egl.h"
+#endif
+
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 struct FormatInfo {
   GLenum format;
   const GLenum* types;
   size_t count;
 };
@@ skipping 983 matching lines @@
 
     if (enable_texture_float) {
       texture_format_validators_[GL_RED_EXT].AddValue(GL_FLOAT);
       texture_format_validators_[GL_RG_EXT].AddValue(GL_FLOAT);
     }
     if (enable_texture_half_float) {
       texture_format_validators_[GL_RED_EXT].AddValue(GL_HALF_FLOAT_OES);
       texture_format_validators_[GL_RG_EXT].AddValue(GL_HALF_FLOAT_OES);
     }
   }
+
+#if !defined(OS_MACOSX)
+  if (workarounds_.ignore_egl_sync_failures) {
+    gfx::GLFenceEGL::SetIgnoreFailures();
+  }
+#endif
 }
 
 void FeatureInfo::AddExtensionString(const char* s) {
   std::string str(s);
   size_t pos = extensions_.find(str);
   while (pos != std::string::npos &&
          pos + str.length() < extensions_.length() &&
          extensions_.substr(pos + str.length(), 1) != " ") {
     // This extension name is a substring of another.
     pos = extensions_.find(str, pos + str.length());
   }
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu