Fixed missing CONNECTED state transition.

remoting/protocol/connection_to_host.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/connection_to_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
@@ skipping 148 matching lines @@
 
   switch (state) {
     case Session::INITIALIZING:
     case Session::CONNECTING:
     case Session::ACCEPTING:
     case Session::CONNECTED:
       // Don't care about these events.
       break;
 
     case Session::AUTHENTICATED:
+      SetState(AUTHENTICATED, OK);
+
       control_dispatcher_.reset(new ClientControlDispatcher());
       control_dispatcher_->Init(
           session_.get(), session_->config().control_config(),
           base::Bind(&ConnectionToHost::OnChannelInitialized,
                      base::Unretained(this)));
       control_dispatcher_->set_client_stub(client_stub_);
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
 
       event_dispatcher_.reset(new ClientEventDispatcher());
       event_dispatcher_->Init(
           session_.get(), session_->config().event_config(),
           base::Bind(&ConnectionToHost::OnChannelInitialized,
                      base::Unretained(this)));
 
       video_reader_ = VideoReader::Create(session_->config());
       video_reader_->Init(session_.get(), video_stub_, base::Bind(
           &ConnectionToHost::OnChannelInitialized, base::Unretained(this)));
 
       audio_reader_ = AudioReader::Create(session_->config());
       if (audio_reader_.get()) {
         audio_reader_->Init(
             session_.get(), session_->config().audio_config(),
             base::Bind(&ConnectionToHost::OnChannelInitialized,
                        base::Unretained(this)));
         audio_reader_->set_audio_stub(audio_stub_);
       }
-
-      SetState(AUTHENTICATED, OK);
       break;
 
     case Session::CLOSED:
       CloseChannels();
       SetState(CLOSED, OK);
       break;
 
     case Session::FAILED:
       // If we were connected then treat signaling timeout error as if
       // the connection was closed by the peer.
@@ skipping 46 matching lines @@
   if (!control_dispatcher_.get() || !control_dispatcher_->is_connected())
     return;
   if (!event_dispatcher_.get() || !event_dispatcher_->is_connected())
     return;
   if (!video_reader_.get() || !video_reader_->is_connected())
     return;
   if ((!audio_reader_.get() || !audio_reader_->is_connected()) &&
       session_->config().is_audio_enabled()) {
     return;
   }
-  if (state_ != CONNECTING)
+  if (state_ != AUTHENTICATED)
     return;
 
   // Start forwarding clipboard and input events.
   clipboard_forwarder_.set_clipboard_stub(control_dispatcher_.get());
   event_forwarder_.set_input_stub(event_dispatcher_.get());
   SetState(CONNECTED, OK);
 }
 
 void ConnectionToHost::CloseOnError(ErrorCode error) {
   CloseChannels();
@@ skipping 16 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting