Cleanup error handling in the client plugin.

remoting/protocol/session.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_SESSION_H_
 #define REMOTING_PROTOCOL_SESSION_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/protocol/buffered_socket_writer.h"
+#include "remoting/protocol/errors.h"
 #include "remoting/protocol/session_config.h"
 
 namespace net {
 class IPEndPoint;
 class Socket;
 class StreamSocket;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
@@ skipping 23 matching lines @@
     // Session has been connected and authenticated.
     AUTHENTICATED,
 
     // Session has been closed.
     CLOSED,
 
     // Connection has failed.
     FAILED,
   };
 
-  // TODO(sergeyu): Move error codes to a separate file.
-  enum Error {
-    OK = 0,
-    PEER_IS_OFFLINE,
-    SESSION_REJECTED,
-    INCOMPATIBLE_PROTOCOL,
-    AUTHENTICATION_FAILED,
-    CHANNEL_CONNECTION_ERROR,
-    UNKNOWN_ERROR,
-  };
-
   // State change callbacks are called after session state has
   // changed. It is not safe to destroy the session from within the
   // handler unless |state| is CLOSED or FAILED.
   typedef base::Callback<void(State state)> StateChangeCallback;
 
   // TODO(lambroslambrou): Merge this together with StateChangeCallback into a
   // single interface.
   typedef base::Callback<void(
       const std::string& channel_name,
       const net::IPEndPoint& remote_end_point,
@@ skipping 11 matching lines @@
 
   // Set callback that is called when state of the connection is changed.
   virtual void SetStateChangeCallback(const StateChangeCallback& callback) = 0;
 
   // Set callback that is called when the route for a channel is changed.
   // The callback must be registered immediately after
   // JingleSessionManager::Connect() or from OnIncomingSession() callback.
   virtual void SetRouteChangeCallback(const RouteChangeCallback& callback) = 0;
 
   // Returns error code for a failed session.
-  virtual Error error() = 0;
+  virtual ErrorCode error() = 0;
 
   // Creates new channels for this connection. The specified callback
   // is called when then new channel is created and connected. The
   // callback is called with NULL if connection failed for any reason.
   // All channels must be destroyed before the session is
   // destroyed. Can be called only when in CONNECTING, CONNECTED or
   // AUTHENTICATED states.
   virtual void CreateStreamChannel(
       const std::string& name, const StreamChannelCallback& callback) = 0;
   virtual void CreateDatagramChannel(
@@ skipping 28 matching lines @@
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_