Update from https://crrev.com/314320

ui/gl/android/surface_texture.cc

 // Copyright 2013 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 "ui/gl/android/surface_texture.h"
 
 #include <android/native_window_jni.h>
 
 // TODO(boliu): Remove this include when we move off ICS.
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "jni/SurfaceTexturePlatformWrapper_jni.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture_listener.h"
 #include "ui/gl/gl_bindings.h"
 
-// TODO(boliu): Remove this method when when we move off ICS. See
-// http://crbug.com/161864.
+// TODO(boliu): Remove this method when Chromium stops supporting ICS.
 bool GlContextMethodsAvailable() {
   bool available = base::android::BuildInfo::GetInstance()->sdk_int() >= 16;
   if (!available)
     LOG(WARNING) << "Running on unsupported device: rendering may not work";
   return available;
 }
 
 namespace gfx {
 
 scoped_refptr<SurfaceTexture> SurfaceTexture::Create(int texture_id) {
@@ skipping 105 matching lines @@
 // static
 bool SurfaceTexture::IsSingleBufferModeSupported() {
   return base::android::BuildInfo::GetInstance()->sdk_int() >= 19;
 }
 
 bool SurfaceTexture::RegisterSurfaceTexture(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace gfx