Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / oobe_browsertest.cc

diff --git a/src/chrome/browser/chromeos/login/oobe_browsertest.cc b/src/chrome/browser/chromeos/login/oobe_browsertest.cc
index 0f34b0c..53b218a 100644 (file)
--- a/src/chrome/browser/chromeos/login/oobe_browsertest.cc
+++ b/src/chrome/browser/chromeos/login/oobe_browsertest.cc
@@ -51,7 +51,7 @@ class OobeTest : public InProcessBrowserTest {
         ::switches::kGaiaUrl, embedded_test_server()->base_url().spec());
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     // If the login display is still showing, exit gracefully.
     if (LoginDisplayHostImpl::default_host()) {
       base::MessageLoop::current()->PostTask(FROM_HERE,
@@ -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();
@@ -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();