3 files changed, 1 insertions, 24 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 8d25b6f..3aff7d7 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -90,11 +90,7 @@ std::string ConnectionStateToString(protocol::ConnectionToHost::State state) {
     case protocol::ConnectionToHost::CONNECTING:
       return "CONNECTING";
     case protocol::ConnectionToHost::AUTHENTICATED:
-      // Report the authenticated state as 'CONNECTING' to avoid changing
-      // the interface between the plugin and webapp.
-      // TODO(garykac) Change to 'AUTHENTICATED' in M44 or once we've switched
-      // the client to NaCl.
-      return "CONNECTING";
+      return "AUTHENTICATED";
     case protocol::ConnectionToHost::CONNECTED:
       return "CONNECTED";
     case protocol::ConnectionToHost::CLOSED:
diff --git a/remoting/webapp/base/js/client_session.js b/remoting/webapp/base/js/client_session.js
index 4ed7264..79056ab 100644
--- a/remoting/webapp/base/js/client_session.js
+++ b/remoting/webapp/base/js/client_session.js
@@ -140,10 +140,6 @@ remoting.ClientSession.State = {
   UNKNOWN: 0,
   INITIALIZING: 1,
   CONNECTING: 2,
-  // We don't currently receive AUTHENTICATED from the host - it comes through
-  // as 'CONNECTING' instead.
-  // TODO(garykac) Update chromoting_instance.cc to send this once we've
-  // shipped a webapp release with support for AUTHENTICATED.
   AUTHENTICATED: 3,
   CONNECTED: 4,
   CLOSED: 5,
diff --git a/remoting/webapp/base/js/log_to_server.js b/remoting/webapp/base/js/log_to_server.js
index 46234a9..42b1ddb 100644
--- a/remoting/webapp/base/js/log_to_server.js
+++ b/remoting/webapp/base/js/log_to_server.js
@@ -118,21 +118,6 @@ remoting.LogToServer.prototype.getSessionId = function() {
 };
 
 /**
- * Whether a session state is one of the states that occurs at the start of
- * a session.
- *
- * @private
- * @param {remoting.ClientSession.State} state
- * @return {boolean}
- */
-remoting.LogToServer.isStartOfSession_ = function(state) {
-  return ((state == remoting.ClientSession.State.CONNECTING) ||
-      (state == remoting.ClientSession.State.INITIALIZING) ||
-      (state == remoting.ClientSession.State.AUTHENTICATED) ||
-      (state == remoting.ClientSession.State.CONNECTED));
-};
-
-/**
  * Whether a session state is one of the states that occurs at the end of
  * a session.
  *