Reenable OobeTest.NewUser

chrome/browser/chromeos/login/oobe_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
@@ skipping 61 matching lines @@
     return static_cast<chromeos::LoginDisplayHostImpl*>(
         chromeos::LoginDisplayHostImpl::default_host())
         ->login_window_for_test();
   }
 
  private:
   FakeGaia fake_gaia_;
   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();
   CHECK(wizard_controller);
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
 
   content::WindowedNotificationObserver(
     chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
     content::NotificationService::AllSources()).Wait();
 
   // TODO(glotov): mock GAIA server (test_server()) should support
   // username/password configuration.
   GetLoginDisplay()->ShowSigninScreenForCreds("username", "password");
 
   content::WindowedNotificationObserver(
     chrome::NOTIFICATION_SESSION_STARTED,
     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();
   CHECK(wizard_controller);
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
 
   content::WindowedNotificationObserver(
     chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
     content::NotificationService::AllSources()).Wait();
 
   gfx::NativeWindow login_window = GetLoginWindowWidget()->GetNativeWindow();
 
   ui_controls::SendKeyPress(login_window,
                             ui::VKEY_E,
                             true,    // control
                             false,   // shift
                             true,    // alt
                             false);  // command
   OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait();
 }
 
 }  // namespace chromeos