Hook up Android closed captions 'enabled' setting to Blink

content/browser/android/content_view_core_impl.cc

 // Copyright 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 "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 1262 matching lines @@
                                         is_non_ime_change);
 }
 
 void ContentViewCoreImpl::SetAccessibilityEnabled(JNIEnv* env, jobject obj,
                                                   bool enabled) {
   SetAccessibilityEnabledInternal(enabled);
 }
 
 void ContentViewCoreImpl::SetTextTrackSettings(JNIEnv* env,
                                                jobject obj,
+                                               jboolean textTracksEnabled,
                                                jstring textTrackBackgroundColor,
                                                jstring textTrackFontFamily,
                                                jstring textTrackFontStyle,
                                                jstring textTrackFontVariant,
                                                jstring textTrackTextColor,
                                                jstring textTrackTextShadow,
                                                jstring textTrackTextSize) {
   FrameMsg_TextTrackSettings_Params params;
+  params.text_tracks_enabled = textTracksEnabled;
   params.text_track_background_color = ConvertJavaStringToUTF8(
       env, textTrackBackgroundColor);
   params.text_track_font_family = ConvertJavaStringToUTF8(
       env, textTrackFontFamily);
   params.text_track_font_style = ConvertJavaStringToUTF8(
       env, textTrackFontStyle);
   params.text_track_font_variant = ConvertJavaStringToUTF8(
       env, textTrackFontVariant);
   params.text_track_text_color = ConvertJavaStringToUTF8(
       env, textTrackTextColor);
   params.text_track_text_shadow = ConvertJavaStringToUTF8(
       env, textTrackTextShadow);
   params.text_track_text_size = ConvertJavaStringToUTF8(
       env, textTrackTextSize);
 
-  web_contents_->GetMainFrame()->SetTextTrackSettings(params);
+  if (web_contents_)

[David Trainor- moved to gerrit, 2015/07/09 21:46:47]

I don't think this can ever be null.

+    web_contents_->GetMainFrame()->SetTextTrackSettings(params);
 }
 
 bool ContentViewCoreImpl::IsFullscreenRequiredForOrientationLock() const {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return true;
   return Java_ContentViewCore_isFullscreenRequiredForOrientationLock(env,
                                                                      obj.obj());
 }
@@ skipping 177 matching lines @@
     return NULL;
 
   return view->GetJavaObject().Release();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content