Updating the Chromoting Test Driver to target the test environment

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 <memory>
 #include <string>
 #include <vector>
@@ skipping 22 matching lines @@
  public:
   struct EnvironmentOptions {
     EnvironmentOptions();
     ~EnvironmentOptions();
 
     std::string user_name;
     std::string host_name;
     std::string host_jid;
     std::string pin;
     base::FilePath refresh_token_file_path;
+    bool use_test_environment;
   };
 
   explicit ChromotingTestDriverEnvironment(const EnvironmentOptions& options);
   ~ChromotingTestDriverEnvironment() override;
 
   // Returns false if a valid access token cannot be retrieved.
   bool Initialize(const std::string& auth_code);
 
   // Retrieves connection information for all known hosts and displays
   // their availability to STDOUT.
@@ skipping 12 matching lines @@
   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_; }
+  bool use_test_environment() const { return use_test_environment_; }
   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
@@ skipping 33 matching lines @@
 
   // 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_;
 
+  // Indicates whether the test environment APIs should be used.
+  bool use_test_environment_;

[Sergey Ulanov, 2016/12/02 19:55:44]

make it const, to ensure it's initialized in the constructor.

+
   // List of remote hosts for the specified user/test-account.
   std::vector<HostInfo> host_list_;
 
   // Used to generate connection setup information to connect to |host_name_|.
   HostInfo host_info_;
 
   // Access token fetcher used by TestDriverEnvironment tests.
-  remoting::test::AccessTokenFetcher* test_access_token_fetcher_;
+  remoting::test::AccessTokenFetcher* test_access_token_fetcher_ = nullptr;
 
   // RefreshTokenStore used by TestDriverEnvironment tests.
-  remoting::test::RefreshTokenStore* test_refresh_token_store_;
+  remoting::test::RefreshTokenStore* test_refresh_token_store_ = nullptr;
 
   // HostListFetcher used by TestDriverEnvironment tests.
-  remoting::test::HostListFetcher* test_host_list_fetcher_;
+  remoting::test::HostListFetcher* test_host_list_fetcher_ = nullptr;
 
   // Used for running network request tasks.
   std::unique_ptr<base::MessageLoopForIO> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingTestDriverEnvironment);
 };
 
 // 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_