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 689 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 has_disabled_attribute =
+    "document.getElementById('" + name + "').hasAttribute('disabled')";
+
+  if (ExecuteScriptAndExtractBool(active_web_contents(),
+    has_disabled_attribute)) {

[Jamie, 2014/09/19 22:37:23]

Nit: Indent the second and subsequent parameters to align with the first.

[anandc, 2014/09/19 22:45:05]

Done.

+    // 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