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

chrome/test/remoting/remote_desktop_browsertest.h

 // 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.
 
 #ifndef CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
 #define CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
 
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 
 namespace {
 // Command line arguments specific to the chromoting browser tests.
 const char kOverrideUserDataDir[] = "override-user-data-dir";
 const char kNoCleanup[] = "no-cleanup";
 const char kNoInstall[] = "no-install";
 const char kWebAppCrx[] = "webapp-crx";
 const char kWebAppUnpacked[] = "webapp-unpacked";
-const char kUsername[] = "username";
-const char kkPassword[] = "password";
+const char kUserNameField[] = "username";

[weitao, 2014/10/08 23:19:16]

Isn't it called "user-name" in the json file?

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

It was "user_name", but I then updated it to "username" to be consistent.
Thanks.

+const char kPasswordField[] = "password";
+const char kAccountsFile[] = "accounts-file";
+const char kAccountType[] = "account-type";
 const char kMe2MePin[] = "me2me-pin";
 const char kRemoteHostName[] = "remote-host-name";
 const char kExtensionName[] = "extension-name";
 const char kHttpServer[] = "http-server";
 
 // ASSERT_TRUE can only be used in void returning functions. This version
 // should be used in non-void-returning functions.
 inline void _ASSERT_TRUE(bool condition) {
   if (!condition) {
     // ASSERT_TRUE only prints the first call frame in the error message.
@@ skipping 82 matching lines @@
   // Simulate typing a string
   void SimulateStringInput(const std::string& input);
 
   // Helper to simulate a left button mouse click.
   void SimulateMouseLeftClickAt(int x, int y);
 
   // Helper to simulate a mouse click.
   void SimulateMouseClickAt(
       int modifiers, blink::WebMouseEvent::Button button, int x, int y);
 
+  bool SetUserNameAndPassword(const base::FilePath &accounts_file);
+
   // The following helpers each perform a composite task.
 
   // Install the chromoting extension
   void Install();
 
   // Perform all necessary steps (installation, authorization, authentication,
   // expanding the me2me section) so that the app is ready for a me2me
   // connection.
   void SetUpTestForMe2Me();
 
@@ skipping 220 matching lines @@
   // WebContent of the landing page in the chromoting app.
   content::WebContents* app_web_content_;
 
   bool no_cleanup_;
   bool no_install_;
   const Extension* extension_;
   base::FilePath webapp_crx_;
   base::FilePath webapp_unpacked_;
   std::string username_;
   std::string password_;
+  std::string accounts_file_;

[weitao, 2014/10/08 23:19:16]

Why store the file path if it's not used anywhere else? But if you do want to
store it for use later I suggest that you store a scoped_ptr to the base::Value
here rather than the file path.

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

Done.

+  std::string account_type_;

[weitao, 2014/10/08 23:19:16]

Same as above.

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

Done.

   std::string me2me_pin_;
   std::string remote_host_name_;
   std::string extension_name_;
   std::string http_server_;
 };
 
 }  // namespace remoting
 
 #endif  // CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_