Fixing the Chromoting Test Driver host online retry logic

remoting/test/chromoting_test_driver_environment.h

 // 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.
 
 #ifndef REMOTING_TEST_CHROMOTING_TEST_DRIVER_ENVIRONMENT_H_
 #define REMOTING_TEST_CHROMOTING_TEST_DRIVER_ENVIRONMENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 46 matching lines @@
   bool WaitForHostOnline(const std::string& host_jid,
                          const std::string& host_name);
 
   // Used to set fake/mock objects for ChromotingTestDriverEnvironment tests.
   // The caller retains ownership of the supplied objects, and must ensure that
   // they remain valid until the ChromotingTestDriverEnvironment instance has
   // been destroyed.
   void SetAccessTokenFetcherForTest(AccessTokenFetcher* access_token_fetcher);
   void SetRefreshTokenStoreForTest(RefreshTokenStore* refresh_token_store);
   void SetHostListFetcherForTest(HostListFetcher* host_list_fetcher);
+  void SetHostNameForTest(const std::string& host_name);
+  void SetHostJidForTest(const std::string& host_jid);
 
   // Accessors for fields used by tests.
   const std::string& access_token() const { return access_token_; }
   const std::string& host_name() const { return host_name_; }
   const std::string& pin() const { return pin_; }
   const std::string& user_name() const { return user_name_; }
   const std::vector<HostInfo>& host_list() const { return host_list_; }
   const HostInfo& host_info() const { return host_info_; }
 
  private:
+  friend class ChromotingTestDriverEnvironmentTest;
+
   // testing::Environment interface.
   void TearDown() override;
 
   // Used to retrieve an access token.  If |auth_code| is empty, then the stored
   // refresh_token will be used instead of |auth_code|.
   // Returns true if a new, valid access token has been retrieved.
   bool RetrieveAccessToken(const std::string& auth_code);
 
   // Called after the access token fetcher completes.
   // The tokens will be empty on failure.
   void OnAccessTokenRetrieved(base::Closure done_closure,
                               const std::string& retrieved_access_token,
                               const std::string& retrieved_refresh_token);
 
   // Used to retrieve a host list from the directory service.
-  // Returns true if the request was successful and |host_list_| is valid.
+  // Returns true if the request was successful, |host_list_| is valid, and
+  // |host_info_| has been set.
   bool RetrieveHostList();
 
   // Clears and then retrieves a new host list.
   bool RefreshHostList();
 
   // Called after the host info fetcher completes.
   void OnHostListRetrieved(base::Closure done_closure,
                            const std::vector<HostInfo>& retrieved_host_list);
 
-  // Checks the status of the host in |host_list_| that matches the given
-  // host_jid and host_name. Returns true if that host is online, false
-  // otherwise.
-  bool IsHostOnline(const std::string host_jid,
-                    const std::string host_name) const;
-
   // Used for authenticating with the directory service.
   std::string access_token_;
 
   // Used to retrieve an access token.
   std::string refresh_token_;
 
   // Used to find remote host in host list.
   std::string host_name_;
 
+  // Used to find remote host in host list.
+  std::string host_jid_;
+
   // The test account for a test case.
   std::string user_name_;
 
   // Used to authenticate a connection with |host_name_|.
   std::string pin_;
 
   // Path to a JSON file containing refresh tokens.
   base::FilePath refresh_token_file_path_;
 
   // List of remote hosts for the specified user/test-account.
@@ skipping 19 matching lines @@
 
 // Unfortunately a global var is how the GTEST framework handles sharing data
 // between tests and keeping long-lived objects around. Used to share access
 // tokens and a host list across tests.
 extern ChromotingTestDriverEnvironment* g_chromoting_shared_data;
 
 }  // namespace test
 }  // namespace remoting
 
 #endif  // REMOTING_TEST_CHROMOTING_TEST_DRIVER_ENVIRONMENT_H_