Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 8436002: [cros] Remove Views implementation for login/OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 0f8d8c6fe548e35d0502419ea9be3c05369e2991..374848133d2d9c7c62e2d65db5cb183c6b801669 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -12,10 +12,8 @@
#include "chrome/browser/chromeos/login/mock_network_screen.h"
#include "chrome/browser/chromeos/login/mock_update_screen.h"
#include "chrome/browser/chromeos/login/network_screen.h"
-#include "chrome/browser/chromeos/login/network_selection_view.h"
#include "chrome/browser/chromeos/login/user_image_screen.h"
#include "chrome/browser/chromeos/login/view_screen.h"
-#include "chrome/browser/chromeos/login/views_oobe_display.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -241,61 +239,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
}
#endif
-#if defined(OFFICIAL_BUILD)
-// This test is supposed to fail on official build.
-#define MAYBE_Accelerators DISABLED_Accelerators
-#else
-#define MAYBE_Accelerators Accelerators
-#endif
-
-IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, MAYBE_Accelerators) {
- //TODO(altimofeev): do not depend on the display realization.
-
- ViewsOobeDisplay* display =
- static_cast<ViewsOobeDisplay*>(controller()->oobe_display_);
- views::View* contents = display->contents_;
-
- EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
-
- views::Accelerator accel_network_screen(ui::VKEY_N, false, true, true);
- views::Accelerator accel_update_screen(ui::VKEY_U, false, true, true);
- views::Accelerator accel_image_screen(ui::VKEY_I, false, true, true);
- views::Accelerator accel_eula_screen(ui::VKEY_E, false, true, true);
- views::Accelerator accel_enterprise_enrollment_screen(
- ui::VKEY_P, false, true, true);
-
- views::FocusManager* focus_manager = NULL;
-
- focus_manager = contents->GetFocusManager();
- EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
- EXPECT_CALL(*mock_enterprise_enrollment_screen_, Show()).Times(1);
- EXPECT_TRUE(
- focus_manager->ProcessAccelerator(accel_enterprise_enrollment_screen));
- EXPECT_EQ(controller()->GetEnterpriseEnrollmentScreen(),
- controller()->current_screen());
-
- focus_manager = contents->GetFocusManager();
- EXPECT_CALL(*mock_enterprise_enrollment_screen_, Hide()).Times(1);
- EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
- EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_network_screen));
- EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
-
- focus_manager = contents->GetFocusManager();
- EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
- EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
- EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_update_screen));
- EXPECT_EQ(controller()->GetUpdateScreen(), controller()->current_screen());
-
- focus_manager = contents->GetFocusManager();
- EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
- EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen));
- EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen());
-
- focus_manager = contents->GetFocusManager();
- EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
- EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen));
- EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
-}
+// TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15,
add_tests_for_new_control_flow_you_just_introduced);

Powered by Google App Engine
This is Rietveld 408576698