Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

17 files changed, 18 insertions, 2 deletions

diff --git a/media/test/data/README b/media/test/data/README
index f4018e3c63..b28b749f7f 100644
--- a/media/test/data/README
+++ b/media/test/data/README
@@ -40,3 +40,19 @@ bear-640x360-v_frag-cenc.mp4 - A fragmented MP4 version of the video track of be
 [1] 30313233343536373839303132333435
 [2] ebdd62f16814d27b68ef122afce4ae3c
 
+// Container Tests (additional containers derived from bear.ogv)
+bear.ac3    -- created using "avconv -i bear.ogv -f ac3 -b 192k bear.ac3".
+bear.adts   -- created using "avconv -i bear.ogv -f adts -strict experimental bear.adts".
+bear.aiff   -- created using "avconv -i bear.ogv -f aiff bear.aiff".
+bear.asf    -- created using "avconv -i bear.ogv -f asf bear.asf".
+bear.avi    -- created using "avconv -i bear.ogv -f avi -b 192k bear.avi".
+bear.eac3   -- created using "avconv -i bear.ogv -f eac3 bear.eac3".
+bear.flac   -- created using "avconv -i bear.ogv -f flac bear.flac".
+bear.flv    -- created using "avconv -i bear.ogv -f flv bear.flv".
+bear.h261   -- created using "avconv -i bear.ogv -f h261 -s:0 cif bear.h261".
+bear.h263   -- created using "avconv -i bear.ogv -f h263 -s:0 cif bear.h263".
+bear.m2ts   -- created using "avconv -i bear.ogv -f mpegts bear.m2ts".
+bear.mjpeg  -- created using "avconv -i bear.ogv -f mjpeg bear.mjpeg".
+bear.mpeg   -- created using "avconv -i bear.ogv -f mpeg bear.mpeg".
+bear.rm     -- created using "avconv -i bear.ogv -f rm -b 192k bear.rm".
+bear.swf    -- created using "avconv -i bear.ogv -f swf -an bear.swf".
diff --git a/media/test/data/bear.ac3 b/media/test/data/bear.ac3
new file mode 100644
index 0000000000..eaf2882ca7
--- /dev/null
+++ b/media/test/data/bear.ac3
diff --git a/media/test/data/bear.adts b/media/test/data/bear.adts
new file mode 100644
index 0000000000..268d521a92
--- /dev/null
+++ b/media/test/data/bear.adts
diff --git a/media/test/data/bear.aiff b/media/test/data/bear.aiff
new file mode 100644
index 0000000000..b8d25536a9
--- /dev/null
+++ b/media/test/data/bear.aiff
diff --git a/media/test/data/bear.asf b/media/test/data/bear.asf
new file mode 100644
index 0000000000..1b967f7b82
--- /dev/null
+++ b/media/test/data/bear.asf
diff --git a/media/test/data/bear.avi b/media/test/data/bear.avi
new file mode 100644
index 0000000000..864cf0cbd2
--- /dev/null
+++ b/media/test/data/bear.avi
diff --git a/media/test/data/bear.eac3 b/media/test/data/bear.eac3
new file mode 100644
index 0000000000..6161b15ef5
--- /dev/null
+++ b/media/test/data/bear.eac3
diff --git a/media/test/data/bear.flac b/media/test/data/bear.flac
new file mode 100644
index 0000000000..6b0286c186
--- /dev/null
+++ b/media/test/data/bear.flac
diff --git a/media/test/data/bear.flv b/media/test/data/bear.flv
new file mode 100644
index 0000000000..85c65962da
--- /dev/null
+++ b/media/test/data/bear.flv
diff --git a/media/test/data/bear.h261 b/media/test/data/bear.h261
new file mode 100644
index 0000000000..c201363062
--- /dev/null
+++ b/media/test/data/bear.h261
diff --git a/media/test/data/bear.h263 b/media/test/data/bear.h263
new file mode 100644
index 0000000000..e625badae6
--- /dev/null
+++ b/media/test/data/bear.h263
diff --git a/media/test/data/bear.m2ts b/media/test/data/bear.m2ts
new file mode 100644
index 0000000000..4508dc463e
--- /dev/null
+++ b/media/test/data/bear.m2ts
diff --git a/media/test/data/bear.mjpeg b/media/test/data/bear.mjpeg
new file mode 100644
index 0000000000..1a4ad2de92
--- /dev/null
+++ b/media/test/data/bear.mjpeg
diff --git a/media/test/data/bear.mpeg b/media/test/data/bear.mpeg
new file mode 100644
index 0000000000..4e51b5a157
--- /dev/null
+++ b/media/test/data/bear.mpeg
diff --git a/media/test/data/bear.rm b/media/test/data/bear.rm
new file mode 100644
index 0000000000..894a150f73
--- /dev/null
+++ b/media/test/data/bear.rm
diff --git a/media/test/data/bear.swf b/media/test/data/bear.swf
new file mode 100644
index 0000000000..f36cb36ca1
--- /dev/null
+++ b/media/test/data/bear.swf
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc
index 222c9874b2..cb51dce71d 100644
--- a/media/test/ffmpeg_tests/ffmpeg_tests.cc
+++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc
@@ -19,9 +19,9 @@
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "media/base/djb2.h"
 #include "media/base/media.h"
 #include "media/ffmpeg/ffmpeg_common.h"