[Chromoting] Fix telemetry error in remoting.It2MeActivity

remoting/webapp/crd/js/it2me_activity.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.
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 (function() {
 
 'use strict';
@@ skipping 28 matching lines @@
 
 };
 
 remoting.It2MeActivity.prototype.dispose = function() {
   base.dispose(this.desktopActivity_);
   this.desktopActivity_ = null;
 };
 
 remoting.It2MeActivity.prototype.start = function() {
   var that = this;
+  var SessionState = remoting.ChromotingEvent.SessionState;
 
   this.logger_ = this.createLogger_();
-  this.logger_.logSessionStateChange(
-      remoting.ChromotingEvent.SessionState.STARTED);
+  this.logger_.logSessionStateChange(SessionState.STARTED);
 
+  base.dispose(this.desktopActivity_);

[Jamie, 2015/11/09 18:16:45]

Do you ever expect desktopActivity to be non-null? If not, then consider
console.assert here, as it leaves the reader fewer combinations to think about.

   this.desktopActivity_ =
       new remoting.DesktopRemotingActivity(this, this.logger_);
 
+  function onError(/** remoting.Error */ error) {
+    if (error.isCancel()) {
+      that.logger_.logSessionStateChange(SessionState.CONNECTION_CANCELED);
+      remoting.setMode(remoting.AppMode.HOME);
+    } else {
+      that.logger_.logSessionStateChange(SessionState.CONNECTION_FAILED, error);
+      that.showErrorMessage_(error);
+    }
+
+    base.dispose(that.desktopActivity_);
+    that.desktopActivity_ = null;
+  }
+
+  var sessionStart = Date.now();
+
   this.accessCodeDialog_.show().then(function(/** string */ accessCode) {
+    that.logger_.setAuthTotalTime(Date.now() - sessionStart);
     that.desktopActivity_.getConnectingDialog().show();
     return that.verifyAccessCode_(accessCode);
   }).then(function() {
     return remoting.HostListApi.getInstance().getSupportHost(that.hostId_);
   }).then(function(/** remoting.Host */ host) {
     that.connect_(host);
-  }).catch(remoting.Error.handler(function(/** remoting.Error */ error) {
-    if (error.hasTag(remoting.Error.Tag.CANCELLED)) {
-      remoting.setMode(remoting.AppMode.HOME);
-    } else {
-      that.showErrorMessage_(error);
-    }
-  }));
+  }).catch(remoting.Error.handler(onError));
 };
 
 
 /**
  * @return {!remoting.SessionLogger}
  * @private
  */
 remoting.It2MeActivity.prototype.createLogger_ = function() {
   var Event = remoting.ChromotingEvent;
   var logger = remoting.SessionLogger.createForClient();
@@ skipping 84 matching lines @@
 /**
  * @param {remoting.Host} host
  * @private
  */
 remoting.It2MeActivity.prototype.connect_ = function(host) {
   this.desktopActivity_.start(
       host, new remoting.CredentialsProvider({accessCode: this.passCode_}));
 };
 
 })();