Cleanup error handling in the client plugin.

remoting/protocol/jingle_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_PEPPER_SESSION_H_
 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 25 matching lines @@
 class JingleSession : public Session,
                       public Transport::EventHandler {
  public:
   virtual ~JingleSession();
 
   // Session interface.
   virtual void SetStateChangeCallback(
       const StateChangeCallback& callback) OVERRIDE;
   virtual void SetRouteChangeCallback(
       const RouteChangeCallback& callback) OVERRIDE;
-  virtual Error error() OVERRIDE;
+  virtual ErrorCode error() OVERRIDE;
   virtual void CreateStreamChannel(
       const std::string& name,
       const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
       const std::string& name,
       const DatagramChannelCallback& callback) OVERRIDE;
   virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
   virtual const std::string& jid() OVERRIDE;
   virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
   virtual const SessionConfig& config() OVERRIDE;
@@ skipping 55 matching lines @@
   // Called from OnAccept() to initialize session config.
   bool InitializeConfigFromDescription(const ContentDescription* description);
 
   void ProcessAuthenticationStep();
 
   void SendTransportInfo();
 
   // Terminates the session and sends session-terminate if it is
   // necessary. |error| specifies the error code in case when the
   // session is being closed due to an error.
-  void CloseInternal(Error error);
+  void CloseInternal(ErrorCode error);
 
   // Sets |state_| to |new_state| and calls state change callback.
   void SetState(State new_state);
 
   JingleSessionManager* session_manager_;
   std::string peer_jid_;
   scoped_ptr<CandidateSessionConfig> candidate_config_;
   StateChangeCallback state_change_callback_;
   RouteChangeCallback route_change_callback_;
 
   std::string session_id_;
   State state_;
-  Error error_;
+  ErrorCode error_;
 
   SessionConfig config_;
   bool config_is_set_;
 
   scoped_ptr<Authenticator> authenticator_;
 
   // Container for pending Iq requests. Requests are removed in
   // CleanupPendingRequests() which is called when a response is
   // received or one of the requests times out.
   std::list<IqRequest*> pending_requests_;
 
   ChannelsMap channels_;
 
   base::OneShotTimer<JingleSession> transport_infos_timer_;
   std::list<cricket::Candidate> pending_candidates_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PEPPER_SESSION_H_