[Chromoting] Use google:remoting namespace to export remoting specific error codes

remoting/protocol/jingle_session.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/jingle_session.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 222 matching lines @@
     LOG(ERROR) << "Failed to send a transport-info message";
   }
 }
 
 void JingleSession::Close(protocol::ErrorCode error) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (is_session_active()) {
     // Send session-terminate message with the appropriate error code.
     JingleMessage::Reason reason;
+    JingleMessage::ErrorCode error_code = JingleMessage::ErrorCode::UNKNOWN;
     switch (error) {
       case OK:
         reason = JingleMessage::SUCCESS;
         break;
       case SESSION_REJECTED:
+        reason = JingleMessage::DECLINE;
+        error_code = JingleMessage::ErrorCode::SESSION_REJECTED;
       case AUTHENTICATION_FAILED:
         reason = JingleMessage::DECLINE;
+        error_code = JingleMessage::ErrorCode::AUTHENTICATION_FAILED;
         break;
       case INVALID_ACCOUNT:
-        // TODO(zijiehe): Instead of using SECURITY_ERROR Jingle reason, add a
-        // new tag under crd namespace to export detail error reason to client.
-        reason = JingleMessage::SECURITY_ERROR;
+        reason = JingleMessage::DECLINE;
+        error_code = JingleMessage::ErrorCode::INVALID_ACCOUNT;
         break;
       case INCOMPATIBLE_PROTOCOL:
         reason = JingleMessage::INCOMPATIBLE_PARAMETERS;
         break;
       case HOST_OVERLOAD:
         reason = JingleMessage::CANCEL;
         break;
       case MAX_SESSION_LENGTH:
         reason = JingleMessage::EXPIRED;
         break;
       case HOST_CONFIGURATION_ERROR:
         reason = JingleMessage::FAILED_APPLICATION;
         break;
       default:
         reason = JingleMessage::GENERAL_ERROR;
     }
 
     JingleMessage message(peer_address_, JingleMessage::SESSION_TERMINATE,
                           session_id_);
     message.reason = reason;
+    message.error_code = error_code;
     SendMessage(message);
   }
 
   error_ = error;
 
   if (state_ != FAILED && state_ != CLOSED) {
     if (error != OK) {
       SetState(FAILED);
     } else {
       SetState(CLOSED);
@@ skipping 198 matching lines @@
 
   switch (message.reason) {
     case JingleMessage::SUCCESS:
       if (state_ == CONNECTING) {
         error_ = SESSION_REJECTED;
       } else {
         error_ = OK;
       }
       break;
     case JingleMessage::DECLINE:
-      error_ = AUTHENTICATION_FAILED;
-      break;
-    case JingleMessage::SECURITY_ERROR:
-      error_ = INVALID_ACCOUNT;
+      switch (message.error_code) {

[Sergey Ulanov, 2016/06/01 08:52:47]

I think we should use the <error-code> for any reason, not only for <decline>.
<reason> matter only for compatibility with older versions that weren't setting
<error-code>

[Hzj_jie, 2016/06/01 23:56:13]

Done.

+        case JingleMessage::ErrorCode::SESSION_REJECTED:
+          // For backward compatibility, we still use AUTHENTICATION_FAILED for
+          // SESSION_REJECTED error.
+          error_ = AUTHENTICATION_FAILED;
+          break;
+        case JingleMessage::ErrorCode::AUTHENTICATION_FAILED:
+          error_ = AUTHENTICATION_FAILED;
+          break;
+        case JingleMessage::ErrorCode::INVALID_ACCOUNT:
+          error_ = INVALID_ACCOUNT;
+          break;
+        default:
+          error_ = UNKNOWN_ERROR;
+      }
       break;
     case JingleMessage::CANCEL:
       error_ = HOST_OVERLOAD;
       break;
     case JingleMessage::EXPIRED:
       error_ = MAX_SESSION_LENGTH;
       break;
     case JingleMessage::INCOMPATIBLE_PARAMETERS:
       error_ = INCOMPATIBLE_PROTOCOL;
       break;
@@ skipping 94 matching lines @@
   }
 }
 
 bool JingleSession::is_session_active() {
   return state_ == CONNECTING || state_ == ACCEPTING || state_ == ACCEPTED ||
         state_ == AUTHENTICATING || state_ == AUTHENTICATED;
 }
 
 }  // namespace protocol
 }  // namespace remoting