Adding 'Show Host List' option to CTD

remoting/test/chromoting_test_driver_environment_unittest.cc

 // Copyright 2015 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/test/chromoting_test_driver_environment.h"
 
 #include <string>
 #include <utility>
 
 #include "base/files/file_path.h"
@@ skipping 63 matching lines @@
 
   fake_host_list_fetcher_.set_retrieved_host_list(fake_host_list);
 
   environment_object_->SetAccessTokenFetcherForTest(
       &fake_access_token_fetcher_);
   environment_object_->SetRefreshTokenStoreForTest(&fake_token_store_);
   environment_object_->SetHostListFetcherForTest(&fake_host_list_fetcher_);
 }
 
 bool ChromotingTestDriverEnvironmentTest::RefreshHostList() {
-  return environment_object_->RefreshHostList();
+  return environment_object_->RefreshHostList() &&
+         environment_object_->FindHostInHostList();
 }
 
 HostInfo ChromotingTestDriverEnvironmentTest::CreateFakeHostInfo() {
   HostInfo host_info;
   host_info.host_id = kFakeHostIdValue;
   host_info.host_jid = kFakeHostJidValue;
   host_info.host_name = kFakeHostNameValue;
   host_info.offline_reason = kFakeHostOfflineReasonValue;
   host_info.public_key = kFakeHostPublicKeyValue;
   host_info.status = kHostStatusOnline;
@@ skipping 11 matching lines @@
   EXPECT_TRUE(fake_token_store_.refresh_token_write_attempted());
   EXPECT_EQ(fake_token_store_.stored_refresh_token_value(),
             kFakeAccessTokenFetcherRefreshTokenValue);
 
   EXPECT_EQ(environment_object_->user_name(), kUserNameValue);
   EXPECT_EQ(environment_object_->host_name(), kHostNameValue);
   EXPECT_EQ(environment_object_->access_token(),
             kFakeAccessTokenFetcherAccessTokenValue);
   EXPECT_EQ(environment_object_->host_list().size(), 0u);
 
-  // Now Retrieve the host list.
-  EXPECT_TRUE(environment_object_->WaitForHostOnline(kFakeHostJidValue,
-                                                     kFakeHostNameValue));
+  // Now retrieve the host list.
+  EXPECT_TRUE(environment_object_->WaitForHostOnline());
 
   // Should only have one host in the list.
   EXPECT_EQ(environment_object_->host_list().size(), kExpectedHostListSize);
   HostInfo fake_host = environment_object_->host_list().at(0);
   EXPECT_EQ(fake_host.host_id, kFakeHostIdValue);
   EXPECT_EQ(fake_host.host_jid, kFakeHostJidValue);
   EXPECT_EQ(fake_host.host_name, kFakeHostNameValue);
   EXPECT_EQ(fake_host.public_key, kFakeHostPublicKeyValue);
   EXPECT_EQ(fake_host.token_url_patterns.at(0), kFakeHostFirstTokenUrlValue);
   EXPECT_EQ(fake_host.token_url_patterns.at(1), kFakeHostSecondTokenUrlValue);
@@ skipping 16 matching lines @@
   // disk originally.
   EXPECT_FALSE(fake_token_store_.refresh_token_write_attempted());
 
   // Verify the object was initialized correctly.
   EXPECT_EQ(environment_object_->user_name(), kUserNameValue);
   EXPECT_EQ(environment_object_->host_name(), kHostNameValue);
   EXPECT_EQ(environment_object_->access_token(),
             kFakeAccessTokenFetcherAccessTokenValue);
   EXPECT_EQ(environment_object_->host_list().size(), 0u);
 
-  // Now Retrieve the host list.
-  EXPECT_TRUE(environment_object_->WaitForHostOnline(kFakeHostJidValue,
-                                                     kFakeHostNameValue));
+  // Now retrieve the host list.
+  EXPECT_TRUE(environment_object_->WaitForHostOnline());
 
   // Should only have one host in the list.
   EXPECT_EQ(environment_object_->host_list().size(), kExpectedHostListSize);
 
   HostInfo fake_host = environment_object_->host_list().at(0);
   EXPECT_EQ(fake_host.host_id, kFakeHostIdValue);
   EXPECT_EQ(fake_host.host_jid, kFakeHostJidValue);
   EXPECT_EQ(fake_host.host_name, kFakeHostNameValue);
   EXPECT_EQ(fake_host.public_key, kFakeHostPublicKeyValue);
   EXPECT_EQ(fake_host.token_url_patterns.at(0), kFakeHostFirstTokenUrlValue);
@@ skipping 87 matching lines @@
   EXPECT_TRUE(environment_object_->Initialize(std::string()));
 
   HostInfo fake_host(CreateFakeHostInfo());
   fake_host.status = kHostStatusOffline;
 
   std::vector<HostInfo> fake_host_list(1, fake_host);
   fake_host_list_fetcher_.set_retrieved_host_list(fake_host_list);
 
   environment_object_->SetHostNameForTest(kFakeHostNameValue);
   environment_object_->SetHostJidForTest(kFakeHostJidValue);
-  EXPECT_FALSE(RefreshHostList());
+  EXPECT_TRUE(RefreshHostList());
   EXPECT_FALSE(environment_object_->host_info().IsReadyForConnection());
 }
 
 TEST_F(ChromotingTestDriverEnvironmentTest, RefreshHostList_HostListEmpty) {
   EXPECT_TRUE(environment_object_->Initialize(std::string()));
 
   // Set the host list fetcher to return an empty list.
   fake_host_list_fetcher_.set_retrieved_host_list(std::vector<HostInfo>());
   environment_object_->SetHostNameForTest(kFakeHostNameValue);
   environment_object_->SetHostJidForTest(kFakeHostJidValue);
   EXPECT_FALSE(RefreshHostList());
   EXPECT_FALSE(environment_object_->host_info().IsReadyForConnection());
 }
 
 }  // namespace test
 }  // namespace remoting