Revert "Reland "ChromeVox hint: Give hint after 20 seconds of idling""

This reverts commit 1d6047d.

Reason for revert: (copied from http://crrev.com/c/2796158)

Findit (https://goo.gl/kROfz5) identified CL at revision 867824 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzFkNjA0N2RiN2JkOWNiMDJiZDcxZGNkMWE4NGRkNzI3MjIyYWI0NTEM

Sample Failed Build: https://ci.chromium.org/b/8851292676415119024

Sample Failed Step: browser_tests

Original change's description:
> Reland "ChromeVox hint: Give hint after 20 seconds of idling"
>
> This is a reland of 4066cc8
>
> Original change's description:
> > ChromeVox hint: Give hint after 20 seconds of idling
> >
> > Currently, the ChromeVox hint is given 20 seconds after the OOBE
> > welcome screen is shown. The only way to cancel the timer and prevent
> > the hint is to click one of the three on-screen buttons. This leads to
> > many people receiving the hint when they don't need it.
> >
> > After discussion with the UI/UX team about the timing of the
> > announcement, we have decided to give the ChromeVox hint after 20
> > seconds of idling. This will help us make a more informed decision
> > about giving the ChromeVox hint, as opposed to the naive approach of
> > giving it after 20 seconds.
> >
> > --gtest_filter="WelcomeScreenChromeVoxHint*.*"
> > Also ran manual tests to ensure the hint is given 20s after idle.
> > seconds of idling, as opposed to 20 seconds after device boot up.
> >
> > Fixed: 1186502
> > Test: out/cros/browser_tests
> > Change-Id: I38eca6b0f7d6c66776bcd2e8e62730250efa0a43
> > AX-Relnotes: The ChromeVox announcement in OOBE now fires after 20
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2752922
> > Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> > Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
> > Commit-Queue: Akihiro Ota <akihiroota@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#866300}
>
> Change-Id: I20aa454ba7ce816897458fdfe30c9bdebcd6d97e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2792064
> Commit-Queue: Akihiro Ota <akihiroota@chromium.org>
> Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#867824}

Change-Id: I526b93a5dc43ea0def903566d620db87746618be
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2794046
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Owners-Override: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#867924}

ash/constants/ash_switches.cc

@@ -237,8 +237,8 @@ const char kDisableLoginAnimations[] = "disable-login-animations";
 // Disables requests for an enterprise machine certificate during attestation.
 const char kDisableMachineCertRequest[] = "disable-machine-cert-request";
 
-// Disables the ChromeVox hint idle detection in OOBE, which can lead to
-// unexpected behavior during tests.
+// Disables the ChromeVox hint timer in OOBE, which can lead to unexpected
+// behavior during tests.
 const char kDisableOOBEChromeVoxHintTimerForTesting[] =
     "disable-oobe-chromevox-hint-timer-for-testing";
 

ash/constants/ash_switches.h

@@ -288,8 +288,7 @@ COMPONENT_EXPORT(ASH_CONSTANTS) bool ShouldOobeUseTabletModeFirstRun();
 COMPONENT_EXPORT(ASH_CONSTANTS)
 bool IsAueReachedForUpdateRequiredForTest();
 
-// Returns true if the OOBE ChromeVox hint idle detection is disabled for
-// testing.
+// Returns true if the OOBE ChromeVox hint timer is disabled for testing.
 COMPONENT_EXPORT(ASH_CONSTANTS)
 bool IsOOBEChromeVoxHintTimerDisabledForTesting();
 

chrome/browser/ash/login/error_screen_browsertest.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/constants/ash_switches.h"
 #include "ash/public/cpp/login_screen_test_api.h"
 #include "base/run_loop.h"
 #include "base/strings/strcat.h"
@@ -79,12 +78,6 @@ class NetworkErrorScreenTest : public InProcessBrowserTest {
     OobeScreenWaiter(WelcomeView::kScreenId).Wait();
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(
-        chromeos::switches::kDisableOOBEChromeVoxHintTimerForTesting);
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-  }
-
   void ShowErrorScreenWithNetworkList() {
     // The only reason we set UI state to UI_STATE_UPDATE is to show a list
     // of networks on the error screen. There are other UI states that show

chrome/browser/ash/login/login_manager_test.cc

@@ -39,8 +39,6 @@ LoginManagerTest::~LoginManagerTest() {}
 void LoginManagerTest::SetUpCommandLine(base::CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
-  command_line->AppendSwitch(
-      chromeos::switches::kDisableOOBEChromeVoxHintTimerForTesting);
 
   MixinBasedInProcessBrowserTest::SetUpCommandLine(command_line);
 }