Updating the Chromoting Test Driver to target the test environment

remoting/test/access_token_fetcher.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/access_token_fetcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
   DCHECK(access_token_callback_.is_null());
 
   VLOG(2) << "Calling GetTokensFromAuthCode to exchange auth_code for token";
 
   access_token_.clear();
   refresh_token_.clear();
   access_token_callback_ = callback;
 
   // Create a new GaiaOAuthClient for each request to GAIA.
   CreateNewGaiaOAuthClientInstance();
-  auth_client_->GetTokensFromAuthCode(
-      oauth_client_info_, auth_code, kMaxGetTokensRetries,
-      this);  // GaiaOAuthClient::Delegate* delegate
+  auth_client_->GetTokensFromAuthCode(oauth_client_info_, auth_code,
+                                      kMaxGetTokensRetries,
+                                      /*delegate=*/this);
 }
 
 void AccessTokenFetcher::GetAccessTokenFromRefreshToken(
     const std::string& refresh_token,
     const AccessTokenCallback& callback) {
   DCHECK(!refresh_token.empty());
   DCHECK(!callback.is_null());
   DCHECK(access_token_callback_.is_null());
 
   VLOG(2) << "Calling RefreshToken to generate a new access token";
 
   access_token_.clear();
   refresh_token_ = refresh_token;
   access_token_callback_ = callback;
 
   // Create a new GaiaOAuthClient for each request to GAIA.
   CreateNewGaiaOAuthClientInstance();
   auth_client_->RefreshToken(oauth_client_info_, refresh_token_,
-                             std::vector<std::string>(),  // scopes
+                             /*scopes=*/std::vector<std::string>(),
                              kMaxGetTokensRetries,
-                             this);  // GaiaOAuthClient::Delegate* delegate
+                             /*delegate=*/this);
 }
 
 void AccessTokenFetcher::CreateNewGaiaOAuthClientInstance() {
   scoped_refptr<remoting::URLRequestContextGetter> request_context_getter;
   request_context_getter = new remoting::URLRequestContextGetter(
       base::ThreadTaskRunnerHandle::Get(),   // network_runner
       base::ThreadTaskRunnerHandle::Get());  // file_runner
 
   auth_client_.reset(new gaia::GaiaOAuthClient(request_context_getter.get()));
 }
@@ skipping 85 matching lines @@
   base::ResetAndReturn(&access_token_callback_)
       .Run(access_token_, refresh_token_);
 }
 
 void AccessTokenFetcher::ValidateAccessToken() {
   VLOG(2) << "Calling GetTokenInfo to validate access token";
 
   // Create a new GaiaOAuthClient for each request to GAIA.
   CreateNewGaiaOAuthClientInstance();
   auth_client_->GetTokenInfo(access_token_, kMaxGetTokensRetries,
-                             this);  // GaiaOAuthClient::Delegate* delegate
+                             /*delegate=*/this);
 }
 
 }  // namespace test
 }  // namespace remoting