Simplify It2Me host shutdown

remoting/host/it2me/it2me_native_messaging_host_unittest.cc

 // Copyright 2013 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/host/it2me/it2me_native_messaging_host.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 116 matching lines @@
 }
 
 void MockIt2MeHost::Disconnect() {
   if (!host_context()->network_task_runner()->BelongsToCurrentThread()) {
     DCHECK(task_runner()->BelongsToCurrentThread());
     host_context()->network_task_runner()->PostTask(
         FROM_HERE, base::Bind(&MockIt2MeHost::Disconnect, this));
     return;
   }
 
-  RunSetState(kDisconnecting);
   RunSetState(kDisconnected);
 }
 
 void MockIt2MeHost::RequestNatPolicy() {}
 
 void MockIt2MeHost::RunSetState(It2MeHostState state) {
   if (!host_context()->network_task_runner()->BelongsToCurrentThread()) {
     host_context()->network_task_runner()->PostTask(
         FROM_HERE, base::Bind(&It2MeHost::SetStateForTesting, this, state, ""));
   } else {
@@ skipping 224 matching lines @@
         ADD_FAILURE() << "Unexpected host state: " << state;
       }
     } else {
       ADD_FAILURE() << "Unexpected message type: " << type;
     }
   }
 }
 
 void It2MeNativeMessagingHostTest::VerifyDisconnectResponses(int request_id) {
   bool disconnect_response_received = false;
-  bool disconnecting_received = false;
   bool disconnected_received = false;
 
-  // We expect a total of 3 messages: 1 connectResponse and 2 hostStateChanged.
-  for (int i = 0; i < 3; ++i) {
+  // We expect a total of 3 messages: 1 connectResponse and 1 hostStateChanged.
+  for (int i = 0; i < 2; ++i) {
     scoped_ptr<base::DictionaryValue> response = ReadMessageFromOutputPipe();
     ASSERT_TRUE(response);
 
     std::string type;
     ASSERT_TRUE(response->GetString("type", &type));
 
     if (type == "disconnectResponse") {
       EXPECT_FALSE(disconnect_response_received);
       disconnect_response_received = true;
       VerifyId(response.Pass(), request_id);
     } else if (type == "hostStateChanged") {
       std::string state;
       ASSERT_TRUE(response->GetString("state", &state));
-      if (state ==
-          It2MeNativeMessagingHost::HostStateToString(kDisconnecting)) {
-        EXPECT_FALSE(disconnecting_received);
-        disconnecting_received = true;
-      } else if (state ==
-                 It2MeNativeMessagingHost::HostStateToString(kDisconnected)) {
+      if (state == It2MeNativeMessagingHost::HostStateToString(kDisconnected)) {
         EXPECT_FALSE(disconnected_received);
         disconnected_received = true;
       } else {
         ADD_FAILURE() << "Unexpected host state: " << state;
       }
     } else {
       ADD_FAILURE() << "Unexpected message type: " << type;
     }
   }
 }
@@ skipping 133 matching lines @@
 }
 
 // Verify rejection if type is unrecognized.
 TEST_F(It2MeNativeMessagingHostTest, InvalidType) {
   base::DictionaryValue message;
   message.SetString("type", "xxx");
   TestBadRequest(message, true);
 }
 
 }  // namespace remoting