Fix Auth browser-test failure: make sure element is ready to receive click.

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 291 matching lines @@
     // active_web_contents() is still the login window but the observer
     // should be set up to observe the chromoting window because that is
     // where we'll receive the message from the login window and reload the
     // chromoting app.
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
           base::Bind(
               &RemoteDesktopBrowserTest::IsAuthenticatedInWindow,
               browser()->tab_strip_model()->GetActiveWebContents()));
 
-    ExecuteScript(
-        "lso.approveButtonAction();"
-        "document.forms[\"connect-approve\"].submit();");
+    // Click to Approve the web-app.
+    ClickOnControl("submit_approve_access");
 
     observer.Wait();
 
     // Popping the login window off the stack to return to the chromoting
     // window.
     web_contents_stack_.pop_back();
   }
 
   ASSERT_TRUE(GetCurrentURL() == Chromoting_Main_URL());
 
@@ skipping 376 matching lines @@
   ASSERT_TRUE(dict_value->GetBoolean("succeeded", &succeeded));
   ASSERT_TRUE(dict_value->GetString("error_message", &error_message));
   ASSERT_TRUE(dict_value->GetString("stack_trace", &stack_trace));
 
   EXPECT_TRUE(succeeded) << error_message << "\n" << stack_trace;
 }
 
 void RemoteDesktopBrowserTest::ClickOnControl(const std::string& name) {
   ASSERT_TRUE(HtmlElementVisible(name));
 
+  ConditionalTimeoutWaiter waiter(
+        base::TimeDelta::FromSeconds(5),
+        base::TimeDelta::FromMilliseconds(500),
+        base::Bind(&RemoteDesktopBrowserTest::IsEnabled,
+                   active_web_contents(),
+                   name));

[weitao, 2014/09/09 23:36:37]

style nit: the last two arguments can fit in the same line (both styles are
acceptable but we normally fit them on the same line in function calls).

[anandc1, 2014/09/10 00:52:26]

Done.

+  EXPECT_TRUE(waiter.Wait());

[weitao, 2014/09/09 23:36:37]

This should be a ASSERT_TRUE because the there is no point to continue the test
if this fails.

[anandc1, 2014/09/10 00:52:26]

Done.

+
   ExecuteScript("document.getElementById(\"" + name + "\").click();");
 }
 
 void RemoteDesktopBrowserTest::EnterPin(const std::string& pin,
                                         bool remember_pin) {
   // Wait for the pin-form to be displayed. This can take a while.
   // We also need to dismiss the host-needs-update dialog if it comes up.
   // TODO(weitaosu) 1: Instead of polling, can we register a callback to be
   // called when the pin-form is ready?
   // TODO(weitaosu) 2: Instead of blindly dismiss the host-needs-update dialog,
@@ skipping 73 matching lines @@
 
 // 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,
+    std::string element_name) {
+  return !ExecuteScriptAndExtractBool(
+    client_web_content,
+    "document.getElementById(\"" + element_name + "\").disabled");
+}
+
 }  // namespace remoting