[Webapp Refactor] Remove remoting.SessionConnector.

remoting/webapp/app_remoting/js/app_remoting_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 || {};
 
 /**
  * Type definition for the RunApplicationResponse returned by the API.
  * @typedef {{
@@ skipping 17 matching lines @@
  * @param {Array<string>} appCapabilities Array of application capabilities.
  *
  * @constructor
  * @implements {remoting.Activity}
  */
 remoting.AppRemotingActivity = function(appCapabilities) {
   /** @private {remoting.AppConnectedView} */
   this.connectedView_ = null;
 
   /** @private */
-  this.connector_ = remoting.SessionConnector.factory.createConnector(
-      document.getElementById('client-container'), appCapabilities,
-      this);
+  this.sessionFactory_ = new remoting.ClientSessionFactory(
+      document.querySelector('#client-container .client-plugin-container'),
+      appCapabilities);
 
   /** @private {remoting.ClientSession} */
   this.session_ = null;
 };
 
 remoting.AppRemotingActivity.prototype.dispose = function() {
   base.dispose(this.connectedView_);
   this.connectedView_ = null;
   remoting.LoadingWindow.close();
 };
@@ skipping 11 matching lines @@
 remoting.AppRemotingActivity.prototype.stop = function() {
   if (this.session_) {
     this.session_.disconnect(remoting.Error.none());
   }
 };
 
 /** @private */
 remoting.AppRemotingActivity.prototype.cleanup_ = function() {
   base.dispose(this.connectedView_);
   this.connectedView_ = null;
+  base.dispose(this.session_);
   this.session_ = null;
 };
 
 /**
  * @param {string} token
  * @return {Promise<!remoting.Xhr.Response>}
  * @private
  */
 remoting.AppRemotingActivity.prototype.getAppHostInfo_ = function(token) {
   var url = remoting.settings.APP_REMOTING_API_BASE_URL + '/applications/' +
@@ skipping 38 matching lines @@
        * @param {function(string, string):void} onThirdPartyTokenFetched
        *     Callback.
        */
       var fetchThirdPartyToken = function(
           tokenUrl, hostPublicKey, scope, onThirdPartyTokenFetched) {
         // Use the authentication tokens returned by the app-remoting server.
         onThirdPartyTokenFetched(host['authorizationCode'],
                                  host['sharedSecret']);
       };
 
-      this.connector_.connect(
-          remoting.Application.Mode.APP_REMOTING, host,
-          new remoting.CredentialsProvider(
-              {fetchThirdPartyToken: fetchThirdPartyToken}));
+      remoting.app.setConnectionMode(remoting.Application.Mode.APP_REMOTING);
+      var credentialsProvider = new remoting.CredentialsProvider(
+              {fetchThirdPartyToken: fetchThirdPartyToken});
+      var that = this;
 
+      this.sessionFactory_.createSession(this).then(
+        function(/** remoting.ClientSession */ session) {
+          that.session_ = session;
+          session.logHostOfflineErrors(true);
+          session.connect(host, credentialsProvider);
+      });
     } else if (response && response.status == 'pending') {
       this.onError(new remoting.Error(
           remoting.Error.Tag.SERVICE_UNAVAILABLE));
     }
   } else {
     console.error('Invalid "runApplication" response from server.');
     this.onError(remoting.Error.fromHttpStatus(xhrResponse.status));
   }
 };
 
 /**
  * @param {remoting.ConnectionInfo} connectionInfo
  */
 remoting.AppRemotingActivity.prototype.onConnected = function(connectionInfo) {
   this.connectedView_ = new remoting.AppConnectedView(
       document.getElementById('client-container'), connectionInfo);
 
-  this.session_ = connectionInfo.session();
   var idleDetector = new remoting.IdleDetector(
       document.getElementById('idle-dialog'), this.stop.bind(this));
 
   // Map Cmd to Ctrl on Mac since hosts typically use Ctrl for keyboard
   // shortcuts, but we want them to act as natively as possible.
   if (remoting.platformIsMac()) {
     connectionInfo.plugin().setRemapKeys('0x0700e3>0x0700e0,0x0700e7>0x0700e4');
   }
 };
 
@@ skipping 15 matching lines @@
 remoting.AppRemotingActivity.prototype.onError = function(error) {
   console.error('Connection failed: ' + error.toString());
   remoting.LoadingWindow.close();
   remoting.MessageWindow.showErrorMessage(
       chrome.i18n.getMessage(/*i18n-content*/'CONNECTION_FAILED'),
       chrome.i18n.getMessage(error.getTag()));
   this.cleanup_();
 };
 
 })();