Retrieved Hostlist information from Directory service.

remoting/test/chromoting_test_driver.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 <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_suite.h"
 #include "base/test/test_switches.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "remoting/test/access_token_fetcher.h"
+#include "remoting/test/chromoting_host_info.h"
 #include "remoting/test/refresh_token_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace switches {
 const char kAuthCodeSwitchName[] = "authcode";
 const char kHelpSwitchName[] = "help";
 const char kHostNameSwitchName[] = "hostname";
 const char kLoggingLevelSwitchName[] = "verbosity";
 const char kRefreshTokenPathSwitchName[] = "refresh-token-path";
 const char kSingleProcessTestsSwitchName[] = "single-process-tests";
@@ skipping 23 matching lines @@
           google_apis::GetOAuth2ClientID(google_apis::CLIENT_REMOTING),
           use_plus).c_str());
 }
 
 void PrintUsage() {
   printf("\n************************************\n");
   printf("*** Chromoting Test Driver Usage ***\n");
   printf("************************************\n");
 
   printf("\nUsage:\n");
   printf("  chromoting_test_driver --username=<example@gmail.com> [options]\n");

[joedow, 2015/07/01 03:39:34]

Doesn't hostname need to be included in the example usage as well?

[tonychun, 2015/07/06 20:11:50]

Done.

   printf("\nRequired Parameters:\n");
   printf("  %s: Specifies which account to use when running tests\n",
          switches::kUserNameSwitchName);
+  printf("  %s: Specifies which host to connect to when running tests\n",
+         switches::kHostNameSwitchName);
   printf("\nOptional Parameters:\n");
   printf("  %s: Exchanged for a refresh and access token for authentication\n",
          switches::kAuthCodeSwitchName);
+  printf("  %s: Displays additional usage information\n",
+         switches::kHelpSwitchName);
   printf("  %s: Path to a JSON file containing username/refresh_token KVPs\n",
          switches::kRefreshTokenPathSwitchName);
-  printf("  %s: Displays additional usage information\n",
-         switches::kHelpSwitchName);
+  printf(
+      "  %s: Specifies the optional logging level of the tool (0-3)."

[joedow, 2015/07/01 03:39:34]

Why is this indented down?  I think there is enough space to move it up.

[tonychun, 2015/07/06 20:11:50]

Done.

+      " [default: off]\n",
+      switches::kLoggingLevelSwitchName);
+
 }
 
 void PrintAuthCodeInfo() {
   printf("\n*******************************\n");
   printf("*** Auth Code Example Usage ***\n");
   printf("*******************************\n\n");
 
   printf("If this is the first time you are running the tool,\n");
   printf("you will need to provide an authorization code.\n");
   printf("This code will be exchanged for a long term refresh token which\n");
@@ skipping 15 matching lines @@
   printf("\nAuthorization URL:\n");
   printf("%s\n", GetAuthorizationCodeUri().c_str());
 
   printf("\nRedirected URL Example:\n");
   printf(
       "https://chromoting-oauth.talkgadget.google.com/talkgadget/oauth/"
       "chrome-remote-desktop/dev?code=4/AKtf...\n");
 
   printf("\nTool usage example with the newly created auth code:\n");
   printf("chromoting_test_driver --%s=example@gmail.com --%s=4/AKtf...\n\n",
          switches::kUserNameSwitchName, switches::kAuthCodeSwitchName);

[joedow, 2015/07/01 03:39:34]

hostname should be shown here, to reduce confusion.

[tonychun, 2015/07/06 20:11:50]

Done.

 }
 
 void PrintJsonFileInfo() {
   printf("\n****************************************\n");
   printf("*** Refresh Token File Example Usage ***\n");
   printf("****************************************\n\n");
 
   printf("In order to use this option, a valid JSON file must exist, be\n");
   printf("properly formatted, and contain a username/token KVP.\n");
   printf("Contents of example_file.json\n");
   printf("{\n");
   printf("  \"username1@fauxdomain.com\": \"1/3798Gsdf898shksdvfyi8sshad\",\n");
   printf("  \"username2@fauxdomain.com\": \"1/8974sdf87asdgadfgaerhfRsAa\",\n");
   printf("}\n\n");
 
   printf("\nTool usage example:\n");
   printf("chromoting_test_driver --%s=%s --%s=./example_file.json\n\n",
          switches::kUserNameSwitchName, "username1@fauxdomain.com",
          switches::kRefreshTokenPathSwitchName);

[joedow, 2015/07/01 03:39:34]

hostname?

[tonychun, 2015/07/06 20:11:50]

Done.

 }
 
+// TODO(TonyChun): Using a namespace global temp string variable that is used to
+// save the access_token value in the callback. Will be removed once an
+// environment is created.
+std::string temp_access_token;

[joedow, 2015/07/01 03:39:34]

A cleaner way to do this would be to add an extra var to your
OnAccessTokenRetrieved callback which is a std::string*, then you can bind that
pointer to your callback as the first param (bind supports currying) and then
you don't need this here.

Just saw that you did this for OnHostlistRetrieved, do it here too!

[tonychun, 2015/07/06 20:11:50]

Done.

+
 } // namespace
 
 void OnAccessTokenRetrieved(
     base::Closure done_closure,
     const std::string& access_token,
     const std::string& refresh_token) {
 
   DVLOG(1) << "OnAccessTokenRetrieved() Called";
+  DVLOG(1) << "Access Token: " << access_token;
 
-  DVLOG(1) << "Access Token: " << access_token;
+  temp_access_token = access_token;
 
   done_closure.Run();
 }
 
+void OnHostlistRetrieved(
+    base::Closure done_closure,
+    std::vector<remoting::test::ChromotingHostInfo>* hostlist,
+    const std::vector<remoting::test::ChromotingHostInfo>& retrieved_hostlist) {
+  DVLOG(1) << "OnHostlistRetrieved() Called";
+

[joedow, 2015/07/01 03:39:34]

DCHECK(hostlist);

[tonychun, 2015/07/06 20:11:50]

Done.

+  *hostlist = retrieved_hostlist;
+
+  done_closure.Run();
+}
+
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
   base::TestSuite test_suite(argc, argv);
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   DCHECK(command_line);
 
   // Do not retry if tests fails.
   command_line->AppendSwitchASCII(switches::kTestLauncherRetryLimit, "0");
 
@@ skipping 60 matching lines @@
     return -1;
   }
 
   // Used for running network request tasks.
   // TODO(TonyChun): Move this logic into a shared environment class.
   base::MessageLoopForIO message_loop;
 
   // Uses the refresh token to get the access token from GAIA.
   remoting::test::AccessTokenFetcher access_token_fetcher;
 
-  base::RunLoop run_loop;
+  // Thread to handle callback from GAIA.
+  base::RunLoop access_token_run_loop;

[joedow, 2015/07/01 03:39:34]

nit: if you use a scoped_ptr<base::RunLoop> you can reset it before each logical
chunk of code that needs a new RunLoop.

[tonychun, 2015/07/06 20:11:50]

Done.

 
   remoting::test::AccessTokenCallback access_token_callback =
-      base::Bind(&OnAccessTokenRetrieved, run_loop.QuitClosure());
+      base::Bind(&OnAccessTokenRetrieved, access_token_run_loop.QuitClosure());
 
   if (!auth_code.empty()) {
     access_token_fetcher.GetAccessTokenFromAuthCode(auth_code,
                                                     access_token_callback);
   } else {
     DCHECK(!refresh_token.empty());
     access_token_fetcher.GetAccessTokenFromRefreshToken(refresh_token,
                                                         access_token_callback);
   }
 
-  run_loop.Run();
+  access_token_run_loop.Run();
+
+  // Thread to handle callback from Directory service.

[joedow, 2015/07/01 03:39:34]

This isn't a thread, it's a runloop which just yields to the thread's
messageloop.  Please update the comment.

[tonychun, 2015/07/06 20:11:50]

Done.

+  base::RunLoop hostlist_run_loop;
+
+  std::vector<remoting::test::ChromotingHostInfo> hostlist;
+
+  remoting::test::HostlistCallback hostlist_fetch_callback = base::Bind(
+      &OnHostlistRetrieved, hostlist_run_loop.QuitClosure(), &hostlist);
+
+  // Uses the access token to get the hostlist from the Directory service.
+  remoting::test::HostlistFetcher hostlist_fetcher;
+
+  hostlist_fetcher.RetrieveHostlist(
+      temp_access_token,
+      remoting::test::ServiceEnvironment::kProductionEnvironment,
+      hostlist_fetch_callback);
+
+  hostlist_run_loop.Run();
 
   return 0;
 }