Updated handling of GCD devices.

remoting/webapp/crd/js/host_controller_unittest.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Unit tests for host_controller.js.
  */
 
 (function() {
@@ skipping 64 matching lines @@
 var mockHostListApi;
 
 QUnit.module('host_controller', {
   beforeEach: function(/** QUnit.Assert */ assert) {
     chromeMocks.identity.mock$setToken(FAKE_IDENTITY_TOKEN);
     remoting.settings = new remoting.Settings();
     remoting.identity = new remoting.Identity();
     mockHostListApi = new remoting.MockHostListApi;
     mockHostListApi.authCodeFromRegister = FAKE_AUTH_CODE;
     mockHostListApi.emailFromRegister = '';
+    mockHostListApi.hostIdFromRegister = FAKE_HOST_ID;
     remoting.HostListApi.setInstance(mockHostListApi);
     base.debug.assert(remoting.oauth2 === null);
     remoting.oauth2 = new remoting.OAuth2();
     base.debug.assert(remoting.hostList === null);
     remoting.hostList = /** @type {remoting.HostList} */
         (Object.create(remoting.HostList.prototype));
 
     // When the HostList's unregisterHostById method is called, make
     // sure the argument is correct.
     unregisterHostByIdSpy =
@@ skipping 163 matching lines @@
     assert.equal(onLocalHostStartedSpy.callCount, 0);
     assert.equal(startDaemonSpy.callCount, 0);
   });
 });
 
 // Check what happens when the HostDaemonFacade's
 // getCredentialsFromAuthCode method fails.
 QUnit.test('start with getCredentialsFromAuthCode failure', function(assert) {
   mockHostDaemonFacade.useEmail = null;
   mockHostDaemonFacade.refreshToken = null;
-  return controller.start(FAKE_HOST_PIN, true).then(function() {
+  return controller.start(FAKE_HOST_PIN, true).then(function(result) {
     throw 'test failed';
   }, function(/** remoting.Error */ e) {
     assert.equal(e.getDetail(), 'getCredentialsFromAuthCode');
     assert.equal(e.getTag(), remoting.Error.Tag.UNEXPECTED);
     assert.equal(getCredentialsFromAuthCodeSpy.callCount, 1);
     assert.equal(onLocalHostStartedSpy.callCount, 0);
     assert.equal(startDaemonSpy.callCount, 0);
   });
 });
 
@@ skipping 69 matching lines @@
       assert.deepEqual(
           getCredentialsFromAuthCodeSpy.args[0][0],
           FAKE_AUTH_CODE);
       assert.equal(getPinHashSpy.callCount, 1);
       assert.deepEqual(
           getPinHashSpy.args[0].slice(0, 2),
           [FAKE_HOST_ID, FAKE_HOST_PIN]);
       assert.equal(unregisterHostByIdSpy.callCount, 0);
       assert.equal(onLocalHostStartedSpy.callCount, 1);
       assert.equal(startDaemonSpy.callCount, 1);
+      var expectedConfig = {
+        xmpp_login: FAKE_XMPP_LOGIN,
+        oauth_refresh_token: FAKE_REFRESH_TOKEN,
+        host_owner: FAKE_CLIENT_JID.toLowerCase(),
+        host_owner_email: FAKE_USER_EMAIL,
+        host_name: FAKE_HOST_NAME,
+        host_secret_hash: fakePinHash,
+        private_key: FAKE_PRIVATE_KEY
+      };
+      if (remoting.settings.USE_GCD) {
+        expectedConfig['gcd_device_id'] = FAKE_HOST_ID;
+      } else {
+        expectedConfig['host_id'] = FAKE_HOST_ID;
+      }
       assert.deepEqual(
           startDaemonSpy.args[0].slice(0, 2),
-          [{
-            xmpp_login: FAKE_XMPP_LOGIN,
-            oauth_refresh_token: FAKE_REFRESH_TOKEN,
-            host_owner: FAKE_CLIENT_JID.toLowerCase(),
-            host_owner_email: FAKE_USER_EMAIL,
-            host_id: FAKE_HOST_ID,
-            host_name: FAKE_HOST_NAME,
-            host_secret_hash: fakePinHash,
-            private_key: FAKE_PRIVATE_KEY
-          }, consent]);
+          [expectedConfig, consent]);
     });
   });
 });
 
 // Check what happens when stopDaemon calls onError.
 // TODO(jrw): Should stopDaemon even have an onError callback?
 QUnit.test('stop with stopDaemon failure', function(assert) {
   mockHostDaemonFacade.stopDaemonResult = null;
   return new Promise(function(resolve, reject) {
     controller.stop(function() {
@@ skipping 209 matching lines @@
       resolve(null);
     });
   });
 });
 
 // Tests omitted for hasFeature, getPairedClients, deletePairedClient,
 // and clearPairedClients because they simply call through to
 // HostDaemonFacade.
 
 })();