diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 13:14:16 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 13:14:16 +0000 |
| commit | 99ad6c9c402c3453044928a6e4414e695feb9200 (patch) | |
| tree | 45cd6cdf99fce2bcb78d2cf2964c5517fece26dd /chrome/test | |
| parent | b7e6c909d97ae845718453961b234cfd181702b3 (diff) | |
| download | chromium_src-99ad6c9c402c3453044928a6e4414e695feb9200.zip chromium_src-99ad6c9c402c3453044928a6e4414e695feb9200.tar.gz chromium_src-99ad6c9c402c3453044928a6e4414e695feb9200.tar.bz2 | |
Adds browser tests exercising multiple iframes for geolocation.
Adds a disabled test waiting for rolling https://bugs.webkit.org/show_bug.cgi?id=36315
TEST=geolocation_browsertest.cc
Review URL: http://codereview.chromium.org/1134001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42212 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rwxr-xr-x | chrome/test/data/geolocation/iframes_different_origin.html | 22 | ||||
| -rw-r--r-- | chrome/test/data/geolocation/simple.html | 4 |
2 files changed, 24 insertions, 2 deletions
diff --git a/chrome/test/data/geolocation/iframes_different_origin.html b/chrome/test/data/geolocation/iframes_different_origin.html new file mode 100755 index 0000000..a2607f6 --- /dev/null +++ b/chrome/test/data/geolocation/iframes_different_origin.html @@ -0,0 +1,22 @@ +<html>
+<script>
+var iframe_id = 0;
+function addIFrame(url) {
+ var iframe = document.createElement('iframe');
+ iframe.src = url;
+ iframe.id = 'iframe_' + (iframe_id++);
+ document.body.appendChild(iframe);
+}
+
+function addIFrames() {
+ port = location.port;
+ path = location.pathname.substring(0, location.pathname.lastIndexOf('/'));
+ addIFrame('http://localhost:' + port + path + '/simple.html');
+ addIFrame('http://127.0.0.1:' + port + path + '/simple.html');
+ return "1";
+}
+</script>
+<body>
+Testing Geolocation with iframes.
+</body>
+</html> diff --git a/chrome/test/data/geolocation/simple.html b/chrome/test/data/geolocation/simple.html index 0e0e5d7..a5d7848 100644 --- a/chrome/test/data/geolocation/simple.html +++ b/chrome/test/data/geolocation/simple.html @@ -30,8 +30,8 @@ function geoGetLastError() { return "" + (last_error ? last_error.code : 0); } - function geoDisableAlerts() { - display_alert = false; + function geoEnableAlerts(enabled) { + display_alert = enabled; return "" + display_alert; } </script> |