Revert of Refactor Chromoting JNI code to use jni/Client (Java changes only).

remoting/android/java/src/org/chromium/chromoting/SessionConnector.java

 // Copyright 2014 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.
 
 package org.chromium.chromoting;
 
-import org.chromium.chromoting.jni.Client;
 import org.chromium.chromoting.jni.ConnectionListener;
+import org.chromium.chromoting.jni.JniInterface;
 
 /**
  * This class manages making a connection to a host, with logic for reloading the host list and
  * retrying the connection in the case of a stale host JID.
  */
-public class SessionConnector implements ConnectionListener, HostListLoader.Callback {
-    private Client mClient;
+public class SessionConnector implements ConnectionListener,
+        HostListLoader.Callback {
     private ConnectionListener mConnectionListener;
     private HostListLoader.Callback mHostListCallback;
     private HostListLoader mHostListLoader;
     private SessionAuthenticator mAuthenticator;
 
     private String mAccountName;
     private String mAuthToken;
 
     /* HostInfo for the host we are connecting to. */
     private HostInfo mHost;
 
     private String mFlags;
 
     /**
      * Tracks whether the connection has been established. Auto-reloading and reconnecting should
      * only happen if connection has not yet occurred.
      */
     private boolean mWasConnected;
     private boolean mTriedReloadingHostList;
 
     /**
      * @param connectionListener Object to be notified on connection success/failure.
      * @param hostListCallback Object to be notified whenever the host list is reloaded.
      * @param hostListLoader The object used for reloading the host list.
      */
-    public SessionConnector(Client client, ConnectionListener connectionListener,
+    public SessionConnector(ConnectionListener connectionListener,
             HostListLoader.Callback hostListCallback, HostListLoader hostListLoader) {
-        mClient = client;
         mConnectionListener = connectionListener;
         mHostListCallback = hostListCallback;
         mHostListLoader = hostListLoader;
     }
 
     /** Initiates a connection to the host. */
     public void connectToHost(String accountName, String authToken, HostInfo host,
             SessionAuthenticator authenticator, String flags) {
         mAccountName = accountName;
         mAuthToken = authToken;
         mHost = host;
         mAuthenticator = authenticator;
         mFlags = flags;
 
         if (hostIncomplete(host)) {
             // These keys might not be present in a newly-registered host, so treat this as a
             // connection failure and reload the host list.
             reloadHostListAndConnect();
             return;
         }
 
         doConnect();
     }
 
     private void doConnect() {
-        mClient.connectToHost(mAccountName, mAuthToken, mHost.jabberId, mHost.id,
+        JniInterface.connectToHost(mAccountName, mAuthToken, mHost.jabberId, mHost.id,
                 mHost.publicKey, mAuthenticator, mFlags, this);
     }
 
     private static boolean hostIncomplete(HostInfo host) {
         return host.jabberId.isEmpty() || host.publicKey.isEmpty();
     }
 
     private void reloadHostListAndConnect() {
         mTriedReloadingHostList = true;
         mHostListLoader.retrieveHostList(mAuthToken, this);
@@ skipping 50 matching lines @@
         // Connection failed and reloading the host list also failed, so report the connection
         // error.
         mConnectionListener.onConnectionState(ConnectionListener.State.FAILED,
                 ConnectionListener.Error.PEER_IS_OFFLINE);
 
         // Notify the caller that the host list failed to load, so the UI is updated accordingly.
         // The currently-displayed host list is not likely to be valid any more.
         mHostListCallback.onError(error);
     }
 }