Make optional the checking for an element being enabled before clicking it.

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 332 matching lines @@
   EXPECT_TRUE(HtmlElementVisible("me2me-content"));
   EXPECT_FALSE(HtmlElementVisible("me2me-first-run"));
 }
 
 void RemoteDesktopBrowserTest::DisconnectMe2Me() {
   // The chromoting extension should be installed.
   ASSERT_TRUE(extension_);
 
   ASSERT_TRUE(RemoteDesktopBrowserTest::IsSessionConnected());
 
+  // Assuming the toolbar-stub is always enabled, click on it.

[Jamie, 2014/09/19 20:29:45]

This comment is no longer needed.

[anandc, 2014/09/19 22:34:26]

Done.

   ClickOnControl("toolbar-stub");
 
   EXPECT_TRUE(HtmlElementVisible("session-toolbar"));
 
   ClickOnControl("toolbar-disconnect");
 
   EXPECT_TRUE(HtmlElementVisible("client-dialog"));
   EXPECT_TRUE(HtmlElementVisible("client-reconnect-button"));
   EXPECT_TRUE(HtmlElementVisible("client-finished-me2me-button"));
 
@@ skipping 337 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));
-  ASSERT_TRUE(waiter.Wait());
+  std::string check_for_disabled =

[Jamie, 2014/09/19 20:29:45]

Maybe call this has_disabled_attribute?

[anandc, 2014/09/19 22:34:26]

Ah, but that takes the line beyond 80 chars. :-)
Done.

+    "document.getElementById(\"" + name + "\").hasAttribute('disabled')";

[Jamie, 2014/09/19 20:29:45]

Nit: Use single quotes for JS code (it also means you don't need to escape them
here).

[anandc, 2014/09/19 22:34:26]

Done.

+
+  if (ExecuteScriptAndExtractBool(active_web_contents(), check_for_disabled)) {
+    // This element has a disabled attribute. Wait for it become enabled.
+    ConditionalTimeoutWaiter waiter(
+          base::TimeDelta::FromSeconds(5),
+          base::TimeDelta::FromMilliseconds(500),
+          base::Bind(&RemoteDesktopBrowserTest::IsEnabled,
+            active_web_contents(), name));
+    ASSERT_TRUE(waiter.Wait());
+  }
 
   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?
@@ skipping 84 matching lines @@
 // 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