Fix ClearBrowserDataBrowserTest.CommitButtonDisabledWhileDeletionInProgress flake.

BUG=379574

Review URL: https://codereview.chromium.org/302293002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274509 0039d316-1c4b-4281-b951-d872f2087c98

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

@@ -51,9 +51,8 @@ class ClearBrowserDataBrowserTest : public OptionsUIBrowserTest {
   }
 };
 
-// Fails flakily. http://crbug.com/379574
 IN_PROC_BROWSER_TEST_F(ClearBrowserDataBrowserTest,
-                       DISABLED_CommitButtonDisabledWhileDeletionInProgress) {
+                       CommitButtonDisabledWhileDeletionInProgress) {
   const char kTimePeriodSelectorId[] = "#clear-browser-data-time-period";
   const char kCommitButtonId[] = "#clear-browser-data-commit";
   BrowsingDataRemoverCompletionInhibitor completion_inhibitor;

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

@@ -130,6 +130,13 @@ void OptionsUIBrowserTest::NavigateToSettingsSubpage(
       subscription = options_ui->RegisterOnFinishedLoadingCallback(
           message_loop_runner->QuitClosure());
   message_loop_runner->Run();
+
+  // The OnFinishedLoading event, which indicates that all WebUI initialization
+  // methods have been called on the JS side, is temporally unrelated to whether
+  // or not the WebContents considers itself to have finished loading. We want
+  // to wait for this too, however, because, e.g. this is a sufficient condition
+  // to get the focus properly placed on a form element.
+  content::WaitForLoadStop(web_contents);
 }
 
 void OptionsUIBrowserTest::NavigateToSettingsFrame() {