commit d6abb468e7c4e9bf96716397aa4933da2d89895b
author Paul Miller <paulmiller@google.com> Tue Dec 09 23:48:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 09 23:48:41 2014 +0000
tree 2d17ca71d06bd038b0e35d22763d113878d7af34
parent 852c714b03e18da2ef3b294a441ed97b47ba5b11
parent c4fb447213634dd386075d7caa510d503fda5789

am c4fb4472: am 23cfdd20: Merge "Expect "jpg", not "jpeg", in testGuessFileName" into lmp-mr1-dev

* commit 'c4fb447213634dd386075d7caa510d503fda5789':
  Expect "jpg", not "jpeg", in testGuessFileName

tests/tests/webkit/src/android/webkit/cts/URLUtilTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/URLUtilTest.java b/tests/tests/webkit/src/android/webkit/cts/URLUtilTest.java
index fb44334..e8f0cab 100644
--- a/tests/tests/webkit/src/android/webkit/cts/URLUtilTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/URLUtilTest.java
@@ -144,7 +144,7 @@
 
     public void testGuessFileName() {
         String url = "ftp://example.url/test";
-        assertEquals("test.jpeg", URLUtil.guessFileName(url, null, "image/jpeg"));
+        assertEquals("test.jpg", URLUtil.guessFileName(url, null, "image/jpeg"));
 
         assertEquals("test.bin", URLUtil.guessFileName(url, null, "application/octet-stream"));
     }