Revert of Clean up. Experimental user avatars removed.

media/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
 
@@ skipping 432 matching lines @@
     deps += [
       ":media_android_jni_headers",
       ":player_android",
       ":video_capture_android_jni_headers",
     ]
     if (!is_android_webview_build) {
       deps += [ ":media_java" ]
     }
   }
 
+  if (is_chromeos) {
+    # A simple WebM encoder for animated avatars on ChromeOS.
+    sources += [
+      "formats/webm/chromeos/ebml_writer.cc",
+      "formats/webm/chromeos/ebml_writer.h",
+      "formats/webm/chromeos/webm_encoder.cc",
+      "formats/webm/chromeos/webm_encoder.h",
+    ]
+    deps += [
+      "//third_party/libvpx",
+      "//third_party/libyuv"
+    ]
+    # For VaapiVideoEncodeAccelerator.
+    if (cpu_arch != "arm" && use_x11) {
+      sources += [
+        "filters/h264_bitstream_buffer.cc",
+        "filters/h264_bitstream_buffer.h",
+      ]
+    }
+  }
+
   if (!is_ios) {
     deps += [ "//third_party/libyuv" ]
   }
 
   if (use_alsa) {
     libs += [ "asound" ]
     defines += [ "USE_ALSA" ]
     sources += [
       "midi/midi_manager_alsa.cc",
       "midi/midi_manager_alsa.h",
@@ skipping 689 matching lines @@
       "base/android/java/src/org/chromium/media/ImageFormat.template",
     ]
     inputs = [
       "video/capture/android/imageformat_list.h"
     ]
     package_name = "org/chromium/media"
   }
 
   # TODO(dalecurtis): Finish media_unittests_apk and media_perftests_apk.
 }