Remove Android Tango related code.

BUG=674440

Change-Id: Ie33ae36877d56987bb3b1ea366558a6afb677a8f
Reviewed-on: https://chromium-review.googlesource.com/940301Reviewed-by: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Aleksandar Stojiljkovic <aleksandar.stojiljkovic@intel.com>
Cr-Commit-Position: refs/heads/master@{#540126}

content/browser/media/media_internals_unittest.cc

@@ -135,7 +135,6 @@ TEST_F(MediaInternalsVideoCaptureDeviceTest,
   api_to_string_map[VideoCaptureApi::ANDROID_API2_FULL] = "Camera API2 Full";
   api_to_string_map[VideoCaptureApi::ANDROID_API2_LIMITED] =
       "Camera API2 Limited";
-  api_to_string_map[VideoCaptureApi::ANDROID_TANGO] = "Tango API";
   EXPECT_EQ(static_cast<size_t>(VideoCaptureApi::UNKNOWN),
             api_to_string_map.size());
   for (const auto& map_entry : api_to_string_map) {

media/capture/mojo/video_capture_types.mojom

@@ -36,7 +36,6 @@ enum VideoCaptureApi {
   ANDROID_API2_LEGACY,
   ANDROID_API2_FULL,
   ANDROID_API2_LIMITED,
-  ANDROID_TANGO,
   UNKNOWN
 };
 

media/capture/mojo/video_capture_types_struct_traits.cc

@@ -122,8 +122,6 @@ EnumTraits<media::mojom::VideoCaptureApi, media::VideoCaptureApi>::ToMojom(
       return media::mojom::VideoCaptureApi::ANDROID_API2_FULL;
     case media::VideoCaptureApi::ANDROID_API2_LIMITED:
       return media::mojom::VideoCaptureApi::ANDROID_API2_LIMITED;
-    case media::VideoCaptureApi::ANDROID_TANGO:
-      return media::mojom::VideoCaptureApi::ANDROID_TANGO;
     case media::VideoCaptureApi::UNKNOWN:
       return media::mojom::VideoCaptureApi::UNKNOWN;
   }
@@ -163,9 +161,6 @@ bool EnumTraits<media::mojom::VideoCaptureApi, media::VideoCaptureApi>::
     case media::mojom::VideoCaptureApi::ANDROID_API2_LIMITED:
       *output = media::VideoCaptureApi::ANDROID_API2_LIMITED;
       return true;
-    case media::mojom::VideoCaptureApi::ANDROID_TANGO:
-      *output = media::VideoCaptureApi::ANDROID_TANGO;
-      return true;
     case media::mojom::VideoCaptureApi::UNKNOWN:
       *output = media::VideoCaptureApi::UNKNOWN;
       return true;

media/capture/video/video_capture_device_descriptor.cc

@@ -88,8 +88,6 @@ const char* VideoCaptureDeviceDescriptor::GetCaptureApiTypeString() const {
       return "Camera API2 Full";
     case VideoCaptureApi::ANDROID_API2_LIMITED:
       return "Camera API2 Limited";
-    case VideoCaptureApi::ANDROID_TANGO:
-      return "Tango API";
     default:
       NOTREACHED() << "Unknown Video Capture API type: "
                    << static_cast<int>(capture_api);

media/capture/video/video_capture_device_descriptor.h

@@ -26,7 +26,6 @@ enum class VideoCaptureApi {
   ANDROID_API2_LEGACY,
   ANDROID_API2_FULL,
   ANDROID_API2_LIMITED,
-  ANDROID_TANGO,
   UNKNOWN
 };
 

media/capture/video/video_capture_device_unittest.cc

@@ -110,19 +110,6 @@ void DumpError(const base::Location& location, const std::string& message) {
   DPLOG(ERROR) << location.ToString() << " " << message;
 }
 
-#if defined(OS_ANDROID)
-static bool IsDeviceUsableForTesting(
-    const VideoCaptureDeviceDescriptor& descriptor) {
-  // Android deprecated/legacy devices and Tango cameras capture on a single
-  // thread, which is occupied by the tests, so nothing gets actually delivered.
-  // TODO(mcasas): use those devices' test mode to deliver frames in a
-  // background thread, https://crbug.com/626857
-  return !VideoCaptureDeviceFactoryAndroid::IsLegacyOrDeprecatedDevice(
-             descriptor.device_id) &&
-         descriptor.capture_api != VideoCaptureApi::ANDROID_TANGO;
-};
-#endif
-
 enum VideoCaptureImplementationTweak {
   NONE,
 #if defined(OS_WIN)
@@ -349,7 +336,12 @@ class VideoCaptureDeviceTest
 
 #if defined(OS_ANDROID)
     for (const auto& descriptor : *device_descriptors_) {
-      if (IsDeviceUsableForTesting(descriptor)) {
+      // Android deprecated/legacy devices capture on a single thread, which is
+      // occupied by the tests, so nothing gets actually delivered.
+      // TODO(mcasas): use those devices' test mode to deliver frames in a
+      // background thread, https://crbug.com/626857
+      if (!VideoCaptureDeviceFactoryAndroid::IsLegacyOrDeprecatedDevice(
+              descriptor.device_id)) {
         DLOG(INFO) << "Using camera " << descriptor.GetNameAndModel();
         return std::make_unique<VideoCaptureDeviceDescriptor>(descriptor);
       }