Android: Remove GetApplicationContext part 4

media/capture/video/android/video_capture_device_factory_android.cc

 // Copyright 2014 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 "media/capture/video/android/video_capture_device_factory_android.h"
 
 #include <utility>
 
-#include "base/android/context_utils.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "jni/VideoCaptureFactory_jni.h"
 #include "media/capture/video/android/video_capture_device_android.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace media {
 
 // static
 ScopedJavaLocalRef<jobject>
 VideoCaptureDeviceFactoryAndroid::createVideoCaptureAndroid(
     int id,
     jlong nativeVideoCaptureDeviceAndroid) {
   return (Java_VideoCaptureFactory_createVideoCapture(
-      AttachCurrentThread(), base::android::GetApplicationContext(), id,
-      nativeVideoCaptureDeviceAndroid));
+      AttachCurrentThread(), id, nativeVideoCaptureDeviceAndroid));
 }
 
 std::unique_ptr<VideoCaptureDevice>
 VideoCaptureDeviceFactoryAndroid::CreateDevice(
     const VideoCaptureDeviceDescriptor& device_descriptor) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
   if (!base::StringToInt(device_descriptor.device_id, &id))
     return std::unique_ptr<VideoCaptureDevice>();
 
@@ skipping 10 matching lines @@
   return nullptr;
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetDeviceDescriptors(
     VideoCaptureDeviceDescriptors* device_descriptors) {
   DCHECK(thread_checker_.CalledOnValidThread());
   device_descriptors->clear();
 
   JNIEnv* env = AttachCurrentThread();
 
-  const JavaRef<jobject>& context = base::android::GetApplicationContext();
-  const int num_cameras =
-      Java_VideoCaptureFactory_getNumberOfCameras(env, context);
+  const int num_cameras = Java_VideoCaptureFactory_getNumberOfCameras(env);
   DVLOG(1) << __func__ << ": num_cameras=" << num_cameras;
   if (num_cameras <= 0)
     return;
 
   for (int camera_id = num_cameras - 1; camera_id >= 0; --camera_id) {
     base::android::ScopedJavaLocalRef<jstring> device_name =
-        Java_VideoCaptureFactory_getDeviceName(env, camera_id, context);
+        Java_VideoCaptureFactory_getDeviceName(env, camera_id);
     if (device_name.obj() == NULL)
       continue;
 
     const int capture_api_type =
-        Java_VideoCaptureFactory_getCaptureApiType(env, camera_id, context);
+        Java_VideoCaptureFactory_getCaptureApiType(env, camera_id);
     const std::string display_name =
         base::android::ConvertJavaStringToUTF8(device_name);
     const std::string device_id = base::IntToString(camera_id);
 
     // Android cameras are not typically USB devices, and the model_id is
     // currently only used for USB model identifiers, so this implementation
     // just indicates an unknown device model (by not providing one).
     device_descriptors->emplace_back(
         display_name, device_id,
         static_cast<VideoCaptureApi>(capture_api_type));
 
     DVLOG(1) << __func__ << ": camera "
              << "device_name=" << display_name << ", unique_id=" << device_id;
   }
 }
 
 void VideoCaptureDeviceFactoryAndroid::GetSupportedFormats(
     const VideoCaptureDeviceDescriptor& device,
     VideoCaptureFormats* capture_formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   int id;
   if (!base::StringToInt(device.device_id, &id))
     return;
   JNIEnv* env = AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobjectArray> collected_formats =
-      Java_VideoCaptureFactory_getDeviceSupportedFormats(
-          env, base::android::GetApplicationContext(), id);
+      Java_VideoCaptureFactory_getDeviceSupportedFormats(env, id);
   if (collected_formats.is_null())
     return;
 
   jsize num_formats = env->GetArrayLength(collected_formats.obj());
   for (int i = 0; i < num_formats; ++i) {
     base::android::ScopedJavaLocalRef<jobject> format(
         env, env->GetObjectArrayElement(collected_formats.obj(), i));
 
     VideoPixelFormat pixel_format = media::PIXEL_FORMAT_UNKNOWN;
     switch (media::Java_VideoCaptureFactory_getCaptureFormatPixelFormat(
@@ skipping 22 matching lines @@
              << VideoCaptureFormat::ToString(capture_format);
   }
 }
 
 bool VideoCaptureDeviceFactoryAndroid::IsLegacyOrDeprecatedDevice(
     const std::string& device_id) {
   int id;
   if (!base::StringToInt(device_id, &id))
     return true;
   return (Java_VideoCaptureFactory_isLegacyOrDeprecatedDevice(
-      AttachCurrentThread(), base::android::GetApplicationContext(), id));
+      AttachCurrentThread(), id));
 }
 
 // static
 VideoCaptureDeviceFactory*
 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   return new VideoCaptureDeviceFactoryAndroid();
 }
 
 }  // namespace media