Cleanup error handling in the client plugin.

remoting/protocol/connection_to_host.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/protocol/connection_to_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/base/constants.h"
 #include "remoting/jingle_glue/javascript_signal_strategy.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/client_control_dispatcher.h"
 #include "remoting/protocol/client_event_dispatcher.h"
 #include "remoting/protocol/client_stub.h"
+#include "remoting/protocol/errors.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/pepper_transport_factory.h"
 #include "remoting/protocol/video_reader.h"
 #include "remoting/protocol/video_stub.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 ConnectionToHost::ConnectionToHost(
@@ skipping 140 matching lines @@
       event_dispatcher_->Init(session_.get(), base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
       break;
 
     case Session::CLOSED:
       CloseChannels();
       SetState(CLOSED, OK);
       break;
 
     case Session::FAILED:
-      switch (session_->error()) {
-        case Session::PEER_IS_OFFLINE:
-          CloseOnError(HOST_IS_OFFLINE);
-          break;
-        case Session::SESSION_REJECTED:
-        case Session::AUTHENTICATION_FAILED:
-          CloseOnError(SESSION_REJECTED);
-          break;
-        case Session::INCOMPATIBLE_PROTOCOL:
-          CloseOnError(INCOMPATIBLE_PROTOCOL);
-          break;
-        case Session::CHANNEL_CONNECTION_ERROR:
-        case Session::UNKNOWN_ERROR:
-          CloseOnError(NETWORK_FAILURE);
-          break;
-        case Session::OK:
-          DLOG(FATAL) << "Error code isn't set";
-          CloseOnError(NETWORK_FAILURE);
+      // If we were connected then treat this error as if the
+      // connection was closed by the peer.
+      //
+      // TODO(sergeyu): This logic belongs to the webapp, but we
+      // currently don't expose this error code to the webapp, and it
+      // would hard to add it because client plugin and webapp
+      // versions may not be in sync. It should be easy to do after we
+      // are finished moving the client plugin to NaCl.

[Jamie, 2012/03/02 00:48:12]

Please add a similar comment to ConvertConnectError. I originally wondered why
we didn't just expose the ErrorCode values to the web-app; this explanation
makes it clear.

[Sergey Ulanov, 2012/03/02 01:04:54]

Done.

+      if (state_ == CONNECTED || session_->error() == SIGNALING_TIMEOUT) {
+        SetState(CLOSED, OK);
+      } else {
+        CloseOnError(session_->error());
       }
       break;
   }
 }
 
 void ConnectionToHost::OnChannelInitialized(bool successful) {
   if (!successful) {
     LOG(ERROR) << "Failed to connect video channel";
     CloseOnError(NETWORK_FAILURE);
     return;
@@ skipping 32 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting