Cleanup error handling in the client plugin.

remoting/client/plugin/pepper_view.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/client/plugin/pepper_view.h"
 
 #include <functional>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 13 matching lines @@
 
 using base::Passed;
 
 namespace remoting {
 
 namespace {
 
 // The maximum number of image buffers to be allocated at any point of time.
 const size_t kMaxPendingBuffersCount = 2;
 
+// TODO(sergeyu): Ideally we should just pass ErrorCode to the webapp
+// and let it handle it, but it would be hard to fix it now because
+// client plugin and webapp versions may not be in sync. It should be
+// easy to do after we are finished moving the client plugin to NaCl.
 ChromotingInstance::ConnectionError ConvertConnectionError(
-    protocol::ConnectionToHost::Error error) {
+    protocol::ErrorCode error) {
   switch (error) {
-    case protocol::ConnectionToHost::OK:
+    case protocol::OK:
       return ChromotingInstance::ERROR_NONE;
-    case protocol::ConnectionToHost::HOST_IS_OFFLINE:
+
+    case protocol::PEER_IS_OFFLINE:
       return ChromotingInstance::ERROR_HOST_IS_OFFLINE;
-    case protocol::ConnectionToHost::SESSION_REJECTED:
+
+    case protocol::SESSION_REJECTED:
+    case protocol::AUTHENTICATION_FAILED:
       return ChromotingInstance::ERROR_SESSION_REJECTED;
-    case protocol::ConnectionToHost::INCOMPATIBLE_PROTOCOL:
+
+    case protocol::INCOMPATIBLE_PROTOCOL:
       return ChromotingInstance::ERROR_INCOMPATIBLE_PROTOCOL;
-    case protocol::ConnectionToHost::NETWORK_FAILURE:
+
+    case protocol::CHANNEL_CONNECTION_ERROR:
+    case protocol::SIGNALING_ERROR:
+    case protocol::SIGNALING_TIMEOUT:
+    case protocol::UNKNOWN_ERROR:
       return ChromotingInstance::ERROR_NETWORK_FAILURE;
   }
   DLOG(FATAL) << "Unknown error code" << error;
   return  ChromotingInstance::ERROR_NONE;
 }
 
 }  // namespace
 
 PepperView::PepperView(ChromotingInstance* instance,
                        ClientContext* context,
@@ skipping 34 matching lines @@
 
   merge_buffer_ = NULL;
   while (!buffers_.empty()) {
     FreeBuffer(buffers_.front());
   }
 
   weak_factory_.InvalidateWeakPtrs();
 }
 
 void PepperView::SetConnectionState(protocol::ConnectionToHost::State state,
-                                    protocol::ConnectionToHost::Error error) {
+                                    protocol::ErrorCode error) {
   DCHECK(context_->main_message_loop()->BelongsToCurrentThread());
 
   switch (state) {
     case protocol::ConnectionToHost::CONNECTING:
       instance_->SetConnectionState(
           ChromotingInstance::STATE_CONNECTING,
           ConvertConnectionError(error));
       break;
 
     case protocol::ConnectionToHost::CONNECTED:
@@ skipping 244 matching lines @@
   // Resume painting for the buffer that was previoulsy postponed because of
   // pending flush.
   if (merge_buffer_ != NULL) {
     buffer = merge_buffer_;
     merge_buffer_ = NULL;
     FlushBuffer(merge_clip_area_, buffer, merge_region_);
   }
 }
 
 }  // namespace remoting