summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-08-26 04:19:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-26 04:19:01 -0700
commita3ba65729b8a9815a313ca3e4333e7e047b9b79d (patch)
tree5a7e4d33b207655a3d149fea8e1657f6e4bdb161
parentcf6e10e145f44cab3eb70f3782b51a92cf61ae7d (diff)
parenta657fe8121472924d6a8188fde0d35bfaba6e3ad (diff)
downloadexternal_webkit-a3ba65729b8a9815a313ca3e4333e7e047b9b79d.zip
external_webkit-a3ba65729b8a9815a313ca3e4333e7e047b9b79d.tar.gz
external_webkit-a3ba65729b8a9815a313ca3e4333e7e047b9b79d.tar.bz2
Merge "Fix line endings on a couple of Android-specific expected results"
-rw-r--r--LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt22
-rw-r--r--LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt30
2 files changed, 26 insertions, 26 deletions
diff --git a/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt
index ae10f02..674ebdc 100644
--- a/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt
+++ b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-expected.txt
@@ -1,11 +1,11 @@
-Tests that when a request is made on a Geolocation object and its Frame is disconnected before a callback is made, the error callback is invoked with the correct error message.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS error.code is 2
-PASS error.message is "Geolocation cannot be used in frameless documents"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+Tests that when a request is made on a Geolocation object and its Frame is disconnected before a callback is made, the error callback is invoked with the correct error message.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS error.code is 2
+PASS error.message is "Geolocation cannot be used in frameless documents"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt
index 18abab4..94ec9a4 100644
--- a/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt
+++ b/LayoutTests/platform/android/fast/dom/Geolocation/disconnected-frame-permission-denied-expected.txt
@@ -1,15 +1,15 @@
-Tests that when a request is made on a Geolocation object, permission is denied and its Frame is disconnected before a callback is made, the error callback is invoked with PERMISSION_DENIED.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS error.code is error.PERMISSION_DENIED
-PASS error.message is "User denied Geolocation"
-
-PASS error.code is error.PERMISSION_DENIED
-PASS error.message is "User denied Geolocation"
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+Tests that when a request is made on a Geolocation object, permission is denied and its Frame is disconnected before a callback is made, the error callback is invoked with PERMISSION_DENIED.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS error.code is error.PERMISSION_DENIED
+PASS error.message is "User denied Geolocation"
+
+PASS error.code is error.PERMISSION_DENIED
+PASS error.message is "User denied Geolocation"
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+