[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 228 matching lines @@
 
   if (is_session_active()) {
     // Send session-terminate message with the appropriate error code.
     JingleMessage::Reason reason;
     switch (error) {
       case OK:
         reason = JingleMessage::SUCCESS;
         break;
       case SESSION_REJECTED:
       case AUTHENTICATION_FAILED:
+      case INVALID_ACCOUNT:
         reason = JingleMessage::DECLINE;
         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;
-        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;
     SendMessage(message);
   }
 
   error_ = error;
 
   if (state_ != FAILED && state_ != CLOSED) {
     if (error != OK) {
       SetState(FAILED);
     } else {
       SetState(CLOSED);
@@ skipping 189 matching lines @@
 void JingleSession::OnTerminate(const JingleMessage& message,
                                 const ReplyCallback& reply_callback) {
   if (!is_session_active()) {
     LOG(WARNING) << "Received unexpected session-terminate message.";
     reply_callback.Run(JingleMessageReply::UNEXPECTED_REQUEST);
     return;
   }
 
   reply_callback.Run(JingleMessageReply::NONE);
 
-  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;
-      break;
-    case JingleMessage::CANCEL:
-      error_ = HOST_OVERLOAD;
-      break;
-    case JingleMessage::EXPIRED:
-      error_ = MAX_SESSION_LENGTH;
-      break;
-    case JingleMessage::INCOMPATIBLE_PARAMETERS:
-      error_ = INCOMPATIBLE_PROTOCOL;
-      break;
-    case JingleMessage::FAILED_APPLICATION:
-      error_ = HOST_CONFIGURATION_ERROR;
-      break;
-    case JingleMessage::GENERAL_ERROR:
-      error_ = CHANNEL_CONNECTION_ERROR;
-      break;
-    default:
-      error_ = UNKNOWN_ERROR;
+  error_ = message.error_code;
+  if (error_ == UNKNOWN_ERROR) {
+    // get error code from message.reason for compatibility with older versions
+    // that do not add <error-code>.
+    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::CANCEL:
+        error_ = HOST_OVERLOAD;
+        break;
+      case JingleMessage::EXPIRED:
+        error_ = MAX_SESSION_LENGTH;
+        break;
+      case JingleMessage::INCOMPATIBLE_PARAMETERS:
+        error_ = INCOMPATIBLE_PROTOCOL;
+        break;
+      case JingleMessage::FAILED_APPLICATION:
+        error_ = HOST_CONFIGURATION_ERROR;
+        break;
+      case JingleMessage::GENERAL_ERROR:
+        error_ = CHANNEL_CONNECTION_ERROR;
+        break;
+      default:
+        error_ = UNKNOWN_ERROR;
+    }
+  } else if (error_ == SESSION_REJECTED) {
+    // For backward compatibility, we still use AUTHENTICATION_FAILED for
+    // SESSION_REJECTED error.
+    // TODO(zijiehe): Handle SESSION_REJECTED error in WebApp. Tracked by
+    // http://crbug.com/618036.
+    error_ = AUTHENTICATION_FAILED;
   }
 
   if (error_ != OK) {
     SetState(FAILED);
   } else {
     SetState(CLOSED);
   }
 }
 
 bool JingleSession::InitializeConfigFromDescription(
@@ skipping 76 matching lines @@
   }
 }
 
 bool JingleSession::is_session_active() {
   return state_ == CONNECTING || state_ == ACCEPTING || state_ == ACCEPTED ||
         state_ == AUTHENTICATING || state_ == AUTHENTICATED;
 }
 
 }  // namespace protocol
 }  // namespace remoting