Hook up Android closed captions 'enabled' setting to Blink

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index a7fb902ecc09f421a09ee70d085c764b18abec79..638d0c9c6f02e267d4440bb9e421cc6b1edd821f 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1280,6 +1280,7 @@ void ContentViewCoreImpl::SetAccessibilityEnabled(JNIEnv* env, jobject obj,
 
 void ContentViewCoreImpl::SetTextTrackSettings(JNIEnv* env,
                                                jobject obj,
+                                               jboolean textTracksEnabled,
                                                jstring textTrackBackgroundColor,
                                                jstring textTrackFontFamily,
                                                jstring textTrackFontStyle,
@@ -1288,6 +1289,7 @@ void ContentViewCoreImpl::SetTextTrackSettings(JNIEnv* env,
                                                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(
@@ -1303,7 +1305,8 @@ void ContentViewCoreImpl::SetTextTrackSettings(JNIEnv* env,
   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 {