Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5202)

Unified Diff: chrome/test/data/extensions/api_test/gcd_private/api/session.js

Issue 695253002: chrome.gcdPrivate allows app to choose pairing method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mon Nov 3 15:09:22 PST 2014 Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/extensions/api_test/gcd_private/api/session.js
diff --git a/chrome/test/data/extensions/api_test/gcd_private/api/session.js b/chrome/test/data/extensions/api_test/gcd_private/api/session.js
index e4d2f9bb845f49ce0f231336fff35ffd4c63f5d0..f069b847f32c330b84188280f4491e847aa981ae 100644
--- a/chrome/test/data/extensions/api_test/gcd_private/api/session.js
+++ b/chrome/test/data/extensions/api_test/gcd_private/api/session.js
@@ -5,23 +5,25 @@
onload = function() {
chrome.test.runTests([
function session() {
- function onConfirmCode(sessionId, status, confirmationInfo) {
+ function onSessionEstablished(sessionId, status, pairingTypes) {
chrome.test.assertEq("success", status);
- chrome.test.assertEq("1234", confirmationInfo.code);
- chrome.test.assertEq("displayCode", confirmationInfo.type);
-
+ chrome.test.assertEq(["embeddedCode"], pairingTypes);
chrome.gcdPrivate.sendMessage(sessionId, "/privet/ping", {},
onMessageSentFail);
-
- chrome.gcdPrivate.confirmCode(sessionId,
- "1234",
- onSessionEstablished.bind(null,
- sessionId));
+ chrome.gcdPrivate.startPairing(sessionId, "embeddedCode",
+ onPairingStarted.bind(null, sessionId));
Aleksey Shlyapnikov 2014/11/03 23:35:09 One more space indent
Vitaly Buka (NO REVIEWS) 2014/11/04 00:54:38 Done.
}
- function onSessionEstablished(sessionId, status) {
+ function onPairingStarted(sessionId, status) {
chrome.test.assertEq("success", status);
+ chrome.gcdPrivate.sendMessage(sessionId, "/privet/ping", {},
+ onMessageSentFail);
+ chrome.gcdPrivate.confirmCode(sessionId, "1234",
+ onCodeConfirmed.bind(null, sessionId));
+ }
+ function onCodeConfirmed(sessionId, status) {
+ chrome.test.assertEq("success", status);
chrome.gcdPrivate.sendMessage(sessionId, "/privet/ping", {},
onMessageSent);
}
@@ -33,11 +35,10 @@ onload = function() {
function onMessageSent(status, output) {
chrome.test.assertEq("success", status);
chrome.test.assertEq("pong", output.response);
-
chrome.test.notifyPass();
}
- chrome.gcdPrivate.establishSession("1.2.3.4", 9090, onConfirmCode);
+ chrome.gcdPrivate.establishSession("1.2.3.4", 9090, onSessionEstablished);
}
]);
};

Powered by Google App Engine
This is Rietveld 408576698