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

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

Issue 13542003: Add browser test for new user CrOS login flow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | chrome/chrome_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index 2d58b5883b00f53281d5ec35ce2b7f6be5512420..933e4e3f5eb37c98720850f239c94c737d8c07d4 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -32,9 +32,9 @@ using ::testing::_;
using ::testing::AnyNumber;
using ::testing::Return;
-namespace chromeos {
+namespace {
-class LoginTestBase : public CrosInProcessBrowserTest {
+class LoginTestBase : public chromeos::CrosInProcessBrowserTest {
public:
LoginTestBase()
: mock_cryptohome_library_(NULL),
@@ -58,8 +58,8 @@ class LoginTestBase : public CrosInProcessBrowserTest {
.WillRepeatedly(Return(true));
}
- MockCryptohomeLibrary* mock_cryptohome_library_;
- MockNetworkLibrary* mock_network_library_;
+ chromeos::MockCryptohomeLibrary* mock_cryptohome_library_;
+ chromeos::MockNetworkLibrary* mock_network_library_;
private:
DISALLOW_COPY_AND_ASSIGN(LoginTestBase);
@@ -147,7 +147,7 @@ class TestContentBrowserClient : public chrome::ChromeContentBrowserClient {
};
-class LoginSigninTest : public CrosInProcessBrowserTest {
+class LoginSigninTest : public chromeos::CrosInProcessBrowserTest {
protected:
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
command_line->AppendSwitch(switches::kLoginManager);
@@ -201,7 +201,8 @@ IN_PROC_BROWSER_TEST_F(LoginGuestTest, CursorShown) {
// Verifies the cursor is hidden at startup on login screen.
IN_PROC_BROWSER_TEST_F(LoginCursorTest, CursorHidden) {
// Login screen needs to be shown explicitly when running test.
- ShowLoginWizard(WizardController::kLoginScreenName, gfx::Size());
+ chromeos::ShowLoginWizard(chromeos::WizardController::kLoginScreenName,
+ gfx::Size());
// Cursor should be hidden at startup
EXPECT_FALSE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
@@ -210,8 +211,8 @@ IN_PROC_BROWSER_TEST_F(LoginCursorTest, CursorHidden) {
EXPECT_TRUE(ui_test_utils::SendMouseMoveSync(gfx::Point()));
EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
- MessageLoop::current()->DeleteSoon(FROM_HERE,
- BaseLoginDisplayHost::default_host());
+ MessageLoop::current()->DeleteSoon(
+ FROM_HERE, chromeos::BaseLoginDisplayHost::default_host());
}
// Verifies that the webui for login comes up successfully.
@@ -223,4 +224,4 @@ IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
runner->Run();
}
-} // namespace chromeos
+}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | chrome/chrome_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698