[Chromoting] SessionLogger refactor.

remoting/webapp/base/js/telemetry_event_writer_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.
 
 (function() {
 
 'use strict';
 
 /** @type {remoting.TelemetryEventWriter.Service} */
 var service;
@@ skipping 74 matching lines @@
   });
 });
 
 QUnit.test('should send CANCELED event when window is closed while started.',
   function(assert) {
   var writeStub = sinon.stub(eventWriter, 'write');
   return service.init().then(function() {
     chrome.app.window.current().id = 'fake-window-id';
   }).then(function() {
     logger.logSessionStateChange(
-        remoting.ChromotingEvent.SessionState.STARTED,
-        remoting.ChromotingEvent.ConnectionError.NONE);
+        remoting.ChromotingEvent.SessionState.STARTED);
   }).then(function() {
     return service.unbindSession('fake-window-id');
   }).then(function() {
     var Event = remoting.ChromotingEvent;
     verifyEvent(writeStub, assert, 1, {
       type: Event.Type.SESSION_STATE,
       session_state: Event.SessionState.CONNECTION_CANCELED,
       connection_error: Event.ConnectionError.NONE,
       application_id: 'extensionId',
       role: Event.Role.CLIENT,
       mode: Event.Mode.ME2ME,
       connection_type: Event.ConnectionType.STUN,
       host_version: 'host_version',
       host_os: remoting.ChromotingEvent.Os.OTHER,
       host_os_version: 'host_os_version'
     });
   });
 });
 
 QUnit.test('should send CANCELED event when window is closed while connecting.',
   function(assert) {
   var writeStub = sinon.stub(eventWriter, 'write');
   return service.init().then(function() {
     chrome.app.window.current().id = 'fake-window-id';
   }).then(function() {
-    logger.logClientSessionStateChange(
-        remoting.ClientSession.State.CONNECTING, remoting.Error.none(), null);
+    logger.logSessionStateChange(
+        remoting.ChromotingEvent.SessionState.CONNECTING);
   }).then(function() {
     return service.unbindSession('fake-window-id');
   }).then(function() {
     var Event = remoting.ChromotingEvent;
     verifyEvent(writeStub, assert, 1, {
       type: Event.Type.SESSION_STATE,
       session_state: Event.SessionState.CONNECTION_CANCELED,
       connection_error: Event.ConnectionError.NONE,
       application_id: 'extensionId',
       role: Event.Role.CLIENT,
       mode: Event.Mode.ME2ME,
       connection_type: Event.ConnectionType.STUN,
       host_version: 'host_version',
       host_os: remoting.ChromotingEvent.Os.OTHER,
       host_os_version: 'host_os_version'
     });
   });
 });
 
 QUnit.test('should send CLOSED event when window is closed while connected.',
   function(assert) {
   var writeStub = sinon.stub(eventWriter, 'write');
 
   return service.init().then(function() {
     chrome.app.window.current().id = 'fake-window-id';
   }).then(function() {
-    logger.logClientSessionStateChange(
-        remoting.ClientSession.State.CONNECTING, remoting.Error.none(), null);
+    logger.logSessionStateChange(
+        remoting.ChromotingEvent.SessionState.CONNECTING);
   }).then(function() {
-    logger.logClientSessionStateChange(
-        remoting.ClientSession.State.CONNECTED, remoting.Error.none(), null);
+    logger.logSessionStateChange(
+        remoting.ChromotingEvent.SessionState.CONNECTED);
   }).then(function() {
     return service.unbindSession('fake-window-id');
   }).then(function() {
     var Event = remoting.ChromotingEvent;
     verifyEvent(writeStub, assert, 2, {
       type: Event.Type.SESSION_STATE,
       session_state: Event.SessionState.CLOSED,
       connection_error: Event.ConnectionError.NONE,
       application_id: 'extensionId',
       role: Event.Role.CLIENT,
       mode: Event.Mode.ME2ME,
       connection_type: Event.ConnectionType.STUN,
       host_version: 'host_version',
       host_os: remoting.ChromotingEvent.Os.OTHER,
       host_os_version: 'host_os_version'
     });
   });
 });
 
 QUnit.test('should not send CLOSED event when window is closed unconnected.',
   function(assert) {
 
   var mockEventWriter = sinon.mock(eventWriter);
   mockEventWriter.expects('write').exactly(2);
 
   return service.init().then(function() {
     chrome.app.window.current().id = 'fake-window-id';
   }).then(function() {
-    logger.logClientSessionStateChange(
-        remoting.ClientSession.State.CONNECTING, remoting.Error.none(), null);
+    logger.logSessionStateChange(
+        remoting.ChromotingEvent.SessionState.CONNECTING);
   }).then(function() {
-    logger.logClientSessionStateChange(
-        remoting.ClientSession.State.FAILED, remoting.Error.none(), null);
+    logger.logSessionStateChange(
+        remoting.ChromotingEvent.SessionState.CONNECTION_FAILED);
   }).then(function() {
     return service.unbindSession('fake-window-id');
   }).then(function() {
     mockEventWriter.verify();
   });
 });
 
 })();