Report correct error when connection cannot be established.

remoting/protocol/pepper_session.cc

 // Copyright (c) 2011 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/pepper_session.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
@@ skipping 266 matching lines @@
         break;
 
       default:
         LOG(WARNING) << "Received session-terminate message "
             "with an unexpected reason.";
         OnError(SESSION_REJECTED);
     }
     return;
   }
 
+  // TODO(sergeyu): We should return CHANNEL_CONNECTION_ERROR only in
+  // case when |message.reason| is set GENERAL_ERROR, but some legacy
+  // hosts may sent terminate messages with reason set to SUCCESS.
+  if (state_ == CONNECTED) {
+    // Session was connected, but we failed to connect channels.
+    OnError(CHANNEL_CONNECTION_ERROR);
+    return;
+  }
+
   CloseInternal(false);
 }
 
 bool PepperSession::InitializeConfigFromDescription(
     const ContentDescription* description) {
   DCHECK(description);
 
   remote_cert_ = description->certificate();
   if (remote_cert_.empty()) {
     LOG(ERROR) << "session-accept does not specify certificate";
@@ skipping 104 matching lines @@
     DCHECK_NE(state_, FAILED);
 
     state_ = new_state;
     if (!state_change_callback_.is_null())
       state_change_callback_.Run(new_state);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting