From c6e73a73bc22470621af8dec228d80348158903b Mon Sep 17 00:00:00 2001
From: Hans-Helge Buerger <mail@hanshelgebuerger.de>
Date: Thu, 17 Nov 2016 16:29:43 +0100
Subject: [PATCH] Make PresentationConnection.onclose pass

To make this test pass a `promise_test` is used.
---
 ...PresentationConnection_onclosed-manual.html | 18 ++++++++++--------
 presentation-api/controlling-ua/common.js      |  9 +++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/presentation-api/controlling-ua/PresentationConnection_onclosed-manual.html b/presentation-api/controlling-ua/PresentationConnection_onclosed-manual.html
index f6d912bcbc97ac..0b6392fb7a3765 100644
--- a/presentation-api/controlling-ua/PresentationConnection_onclosed-manual.html
+++ b/presentation-api/controlling-ua/PresentationConnection_onclosed-manual.html
@@ -20,22 +20,24 @@ <h2>Description</h2>
 
 <script>
   setup({explicit_timeout: true});
+
   var startPresentation = function () {
     document.getElementById('presentBtn').disabled = true;
-    async_test(function(t) {
+
+    promise_test(function(t) {
       var request = new PresentationRequest(presentationUrls);
-      request.start()
-        .then(function(connection) {
+
+      var check = function(connection) {
           assert_true(connection instanceof PresentationConnection, 'the connection is setup');
           connection.onclose = t.step_func_done(function(evt) {
             assert_equals(evt.type, "close");
             assert_equals(connection.state, "closed");
           });
           connection.close();
-      })
-      .catch(function(ex) {
-        assert_unreached(ex.name + ":" + ex.message);
-      });
+        };
+
+      return request.start().then(check);
     }, "the onclose is fired and the connection state is closed.");
-  }
+  };
+
 </script>
diff --git a/presentation-api/controlling-ua/common.js b/presentation-api/controlling-ua/common.js
index a86cb7d955ec0e..fe31c1295e082a 100644
--- a/presentation-api/controlling-ua/common.js
+++ b/presentation-api/controlling-ua/common.js
@@ -7,10 +7,11 @@
   // on something that directly or indirectly maps to a resource on the W3C test
   // server.
   var castAppId = '915D2A2C';
-  var castUrl = 'https://google.com/cast#__castAppId__=' + castAppId;
+  var castClientId = String(new Date().getTime()) + String(Math.floor(Math.random() * 1e5));
+  var castUrl = 'https://google.com/cast#__castAppId__=' + castAppId + '/__castClientId__=' + castClientId;
 
   window.presentationUrls = [
-    'support/presentation.html',
-    castUrl
+    castUrl,
+    'support/presentation.html'
   ];
-})(window);
\ No newline at end of file
+})(window);