Revert of Android: Remove GetApplicationContext part 2

chrome/android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java

 // 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.
 
 package org.chromium.chrome.browser;
 
+import android.content.Context;
 import android.os.Build;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.CalledByNative;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Locale;
 
 /**
  * This class is the Java counterpart to the C++ TtsPlatformImplAndroid class.
@@ skipping 39 matching lines @@
         float mVolume;
     }
 
     private long mNativeTtsPlatformImplAndroid;
     protected final TextToSpeech mTextToSpeech;
     private boolean mInitialized;
     private ArrayList<TtsVoice> mVoices;
     private String mCurrentLanguage;
     private PendingUtterance mPendingUtterance;
 
-    protected TtsPlatformImpl(long nativeTtsPlatformImplAndroid) {
+    protected TtsPlatformImpl(long nativeTtsPlatformImplAndroid, Context context) {
         mInitialized = false;
         mNativeTtsPlatformImplAndroid = nativeTtsPlatformImplAndroid;
-        mTextToSpeech = new TextToSpeech(
-                ContextUtils.getApplicationContext(), new TextToSpeech.OnInitListener() {
-                    @Override
-                    public void onInit(int status) {
-                        if (status == TextToSpeech.SUCCESS) {
-                            ThreadUtils.runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    initialize();
-                                }
-                            });
-                        }
+        mTextToSpeech = new TextToSpeech(context, new TextToSpeech.OnInitListener() {
+                @Override
+                public void onInit(int status) {
+                    if (status == TextToSpeech.SUCCESS) {
+                        ThreadUtils.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                initialize();
+                            }
+                        });
                     }
-                });
+                }
+            });
         addOnUtteranceProgressListener();
     }
 
     /**
      * Create a TtsPlatformImpl object, which is owned by TtsPlatformImplAndroid
      * on the C++ side.
-     *  @param nativeTtsPlatformImplAndroid The C++ object that owns us.
      *
+     * @param nativeTtsPlatformImplAndroid The C++ object that owns us.
+     * @param context The app context.
      */
     @CalledByNative
-    private static TtsPlatformImpl create(long nativeTtsPlatformImplAndroid) {
+    private static TtsPlatformImpl create(long nativeTtsPlatformImplAndroid,
+                                          Context context) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            return new LollipopTtsPlatformImpl(nativeTtsPlatformImplAndroid);
+            return new LollipopTtsPlatformImpl(nativeTtsPlatformImplAndroid, context);
         } else {
-            return new TtsPlatformImpl(nativeTtsPlatformImplAndroid);
+            return new TtsPlatformImpl(nativeTtsPlatformImplAndroid, context);
         }
     }
 
     /**
      * Called when our C++ counterpoint is deleted. Clear the handle to our
      * native C++ object, ensuring it's never called.
      */
     @CalledByNative
     private void destroy() {
         mNativeTtsPlatformImplAndroid = 0;
@@ skipping 204 matching lines @@
         if (mPendingUtterance != null) mPendingUtterance.speak();
 
         TraceEvent.end("TtsPlatformImpl:initialize");
     }
 
     private native void nativeVoicesChanged(long nativeTtsPlatformImplAndroid);
     private native void nativeOnEndEvent(long nativeTtsPlatformImplAndroid, int utteranceId);
     private native void nativeOnStartEvent(long nativeTtsPlatformImplAndroid, int utteranceId);
     private native void nativeOnErrorEvent(long nativeTtsPlatformImplAndroid, int utteranceId);
 }