Fix initial focus, and the way elements are disabled on the 'Clear browsing data' dialog.

chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc

Index: chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc
index ff33e276047db74945f886a03d6b950d3c484759..836a983733ef0b3cdf56a2779ab0849aad96ab7a 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_browsertest.cc
@@ -26,6 +26,16 @@ class ClearBrowserDataBrowserTest : public OptionsUIBrowserTest {
     return element_enabled;
   }
 
+  bool IsElementInFocus(const std::string& selector) {
+    bool element_in_focus = false;
+    EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+        GetSettingsFrame(),
+        "window.domAutomationController.send(document.querySelector('" +
+            selector + "') == document.activeElement);",
+        &element_in_focus));
+    return element_in_focus;
+  }
+
  private:
   void GetElementEnabledState(
       const std::string& selector,
@@ -40,12 +50,15 @@ class ClearBrowserDataBrowserTest : public OptionsUIBrowserTest {
 
 IN_PROC_BROWSER_TEST_F(ClearBrowserDataBrowserTest,
                        CommitButtonDisabledWhileDeletionInProgress) {
+  const char kTimePeriodSelectorId[] = "#clear-browser-data-time-period";
   const char kCommitButtonId[] = "#clear-browser-data-commit";
   BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
 
   // Navigate to the Clear Browsing Data dialog to ensure that the commit button
   // is initially enabled, usable, and gets disabled after having been pressed.
+  // Also verify that the time period combo-box gets the initial focus.
   NavigateToSettingsSubpage(chrome::kClearBrowserDataSubPage);
+  EXPECT_TRUE(IsElementInFocus(kTimePeriodSelectorId));
   ASSERT_NO_FATAL_FAILURE(ClickElement(kCommitButtonId));
   EXPECT_FALSE(IsElementEnabled(kCommitButtonId));