Skip to content

Commit

Permalink
Revert of Disable flaky OobeTests: NewUser and Accelerator on ChromeOS (
Browse files Browse the repository at this point in the history
https://codereview.chromium.org/247363004/)

Reason for revert:
Blink change has been reverted
http://crbug.com/365507

Original issue's description:
> Disable flaky OobeTests: NewUser and Accelerator on ChromeOS
> 
> TBR=piman@chromium.org
> BUG=365507
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=265332

TBR=xiyuan@chromium.org,piman@chromium.org,brianderson@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=365507

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265523 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
nkostylev@chromium.org committed Apr 23, 2014
1 parent b4e7e34 commit 2f6c850
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions chrome/browser/chromeos/login/oobe_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ class OobeTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(OobeTest);
};

#if defined(OS_CHROMEOS)
#define MAYBE_NewUser DISABLED_NewUser
#else
#define MAYBE_NewUser NewUser
#endif
IN_PROC_BROWSER_TEST_F(OobeTest, MAYBE_NewUser) {
IN_PROC_BROWSER_TEST_F(OobeTest, NewUser) {
chromeos::WizardController::SkipPostLoginScreensForTesting();
chromeos::WizardController* wizard_controller =
chromeos::WizardController::default_controller();
Expand All @@ -104,12 +99,7 @@ IN_PROC_BROWSER_TEST_F(OobeTest, MAYBE_NewUser) {
content::NotificationService::AllSources()).Wait();
}

#if defined(OS_CHROMEOS)
#define MAYBE_Accelerator DISABLED_Accelerator
#else
#define MAYBE_Accelerator Accelerator
#endif
IN_PROC_BROWSER_TEST_F(OobeTest, MAYBE_Accelerator) {
IN_PROC_BROWSER_TEST_F(OobeTest, Accelerator) {
chromeos::WizardController::SkipPostLoginScreensForTesting();
chromeos::WizardController* wizard_controller =
chromeos::WizardController::default_controller();
Expand Down

0 comments on commit 2f6c850

Please sign in to comment.