Update chromoting browser-tests to obtain user-name and password from a specified file.

chrome/test/remoting/remote_desktop_browsertest.cc

 // Copyright 2013 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 "chrome/test/remoting/remote_desktop_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 16 matching lines @@
 namespace remoting {
 
 RemoteDesktopBrowserTest::RemoteDesktopBrowserTest()
     : extension_(NULL) {
 }
 
 RemoteDesktopBrowserTest::~RemoteDesktopBrowserTest() {}
 
 void RemoteDesktopBrowserTest::SetUp() {
   ParseCommandLine();
+
   PlatformAppBrowserTest::SetUp();
 }
 
 void RemoteDesktopBrowserTest::SetUpOnMainThread() {
   PlatformAppBrowserTest::SetUpOnMainThread();
 
   // Pushing the initial WebContents instance onto the stack before
   // RunTestOnMainThread() and after |InProcessBrowserTest::browser_|
   // is initialized in InProcessBrowserTest::RunTestOnMainThreadLoop()
   web_contents_stack_.push_back(
@@ skipping 420 matching lines @@
   VerifyInternetAccess();
   Install();
   LaunchChromotingApp();
   Auth();
   LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js"));
   ExpandMe2Me();
   EnsureRemoteConnectionEnabled();
 }
 
 void RemoteDesktopBrowserTest::Auth() {
+  // For this test, we must be given the user-name and password.
+  ASSERT_TRUE(!username_.empty() && !password_.empty());

[anandc, 2014/10/09 00:15:25]

Added these just to fail quicker.

+
   Authorize();
   Authenticate();
   Approve();
 }
 
 void RemoteDesktopBrowserTest::EnsureRemoteConnectionEnabled() {
   // browser_test.ensureRemoteConnectionEnabled is defined in
   // browser_test.js, which must be loaded before calling this function.
   // TODO(kelvinp): This function currently only works on linux when the user is
   // already part of the chrome-remote-desktop group.  Extend this functionality
@@ skipping 78 matching lines @@
   if (command_line->HasSwitch(kOverrideUserDataDir)) {
     const base::FilePath& override_user_data_dir =
         command_line->GetSwitchValuePath(kOverrideUserDataDir);
 
     ASSERT_FALSE(override_user_data_dir.empty());
 
     command_line->AppendSwitchPath(switches::kUserDataDir,
                                    override_user_data_dir);
   }
 
-  username_ = command_line->GetSwitchValueASCII(kUsername);
-  password_ = command_line->GetSwitchValueASCII(kkPassword);
+  std::string accounts_file = command_line->GetSwitchValueASCII(kAccountsFile);
+  std::string account_type = command_line->GetSwitchValueASCII(kAccountType);
+  if (!accounts_file.empty()) {
+    // We've been passed in a file containing accounts information.
+    // In this case, we'll obtain the user-name and password information from
+    // the specified file, even if user-name and password have been specified
+    // on the command-line.
+    base::FilePath accounts_file_path(accounts_file);
+    ASSERT_FALSE(account_type.empty());
+    ASSERT_TRUE(base::PathExists(accounts_file_path));
+    SetUserNameAndPassword(accounts_file_path, account_type);
+  } else {
+    // No file for accounts specified. Read user-name and password from command
+    // line.
+    username_ = command_line->GetSwitchValueASCII(kUserName);
+    password_ = command_line->GetSwitchValueASCII(kPassword);
+  }
+
   me2me_pin_ = command_line->GetSwitchValueASCII(kMe2MePin);
   remote_host_name_ = command_line->GetSwitchValueASCII(kRemoteHostName);
   extension_name_ = command_line->GetSwitchValueASCII(kExtensionName);
   http_server_ = command_line->GetSwitchValueASCII(kHttpServer);
 
   no_cleanup_ = command_line->HasSwitch(kNoCleanup);
   no_install_ = command_line->HasSwitch(kNoInstall);
 
   if (!no_install_) {
     webapp_crx_ = command_line->GetSwitchValuePath(kWebAppCrx);
@@ skipping 204 matching lines @@
 bool RemoteDesktopBrowserTest::IsPinFormVisible() {
   DismissHostVersionWarningIfVisible();
   return HtmlElementVisible("pin-form");
 }
 
 void RemoteDesktopBrowserTest::DismissHostVersionWarningIfVisible() {
   if (HtmlElementVisible("host-needs-update-connect-button"))
     ClickOnControl("host-needs-update-connect-button");
 }
 
+void RemoteDesktopBrowserTest::SetUserNameAndPassword(
+    const base::FilePath &accounts_file_path, const std::string account_type) {
+
+  // Read contents of accounts file.
+  std::string accounts_info;
+  ASSERT_TRUE(base::ReadFileToString(accounts_file_path, &accounts_info));
+
+  // Get the root dictionary from the input json file contents.
+  scoped_ptr<base::Value> root(
+      base::JSONReader::Read(accounts_info, base::JSON_ALLOW_TRAILING_COMMAS));
+  DCHECK(root.get() != NULL);

[weitao, 2014/10/09 00:23:28]

Change to ASSERT_TRUE?

[anandc, 2014/10/09 00:39:59]

Merged with the following ASSERT_TRUE.

+
+  const base::DictionaryValue* root_dict = NULL;
+  ASSERT_TRUE(root.get() && root->GetAsDictionary(&root_dict));

[weitao, 2014/10/09 00:23:28]

You have already DCHECKed on root.Get() earlier.

[anandc, 2014/10/09 00:39:59]

Done.

+
+  // Now get the dictionary for the specified account type.
+  const base::DictionaryValue* account_dict = NULL;
+  ASSERT_TRUE(root_dict->GetDictionary(account_type, &account_dict));
+

[weitao, 2014/10/09 00:23:28]

Remove this blank line.

[anandc, 2014/10/09 00:39:59]

Done.

+  ASSERT_TRUE(account_dict->GetString(kUserName, &username_));
+

[weitao, 2014/10/09 00:23:28]

ditto.

[anandc, 2014/10/09 00:39:59]

Done.

+  ASSERT_TRUE(account_dict->GetString(kPassword, &password_));
+}
+
 // static
 bool RemoteDesktopBrowserTest::IsAuthenticatedInWindow(
     content::WebContents* web_contents) {
   return ExecuteScriptAndExtractBool(
       web_contents, "remoting.identity.isAuthenticated()");
 }
 
 // static
 bool RemoteDesktopBrowserTest::IsHostActionComplete(
     content::WebContents* client_web_content,
     std::string host_action_var) {
   return ExecuteScriptAndExtractBool(
       client_web_content,
       host_action_var);
 }
 
 // static
 bool RemoteDesktopBrowserTest::IsEnabled(
     content::WebContents* client_web_content,
     const std::string& element_name) {
   return !ExecuteScriptAndExtractBool(
     client_web_content,
     "document.getElementById(\"" + element_name + "\").disabled");
 }
 
 }  // namespace remoting