OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand)); | 566 EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand)); |
567 | 567 |
568 // RLZ value for homepage access point should have been initialized. | 568 // RLZ value for homepage access point should have been initialized. |
569 base::string16 rlz_string; | 569 base::string16 rlz_string; |
570 EXPECT_TRUE(RLZTracker::GetAccessPointRlz( | 570 EXPECT_TRUE(RLZTracker::GetAccessPointRlz( |
571 RLZTracker::ChromeHomePage(), &rlz_string)); | 571 RLZTracker::ChromeHomePage(), &rlz_string)); |
572 EXPECT_EQ(base::string16(), rlz_string); | 572 EXPECT_EQ(base::string16(), rlz_string); |
573 } | 573 } |
574 #endif | 574 #endif |
575 | 575 |
576 TEST_P(LoginUtilsBlockingLoginTest, LoginBlocksForUser) { | 576 // http://crbug.com/396506 |
| 577 TEST_P(LoginUtilsBlockingLoginTest, DISABLED_LoginBlocksForUser) { |
577 UserManager* user_manager = UserManager::Get(); | 578 UserManager* user_manager = UserManager::Get(); |
578 EXPECT_FALSE(user_manager->IsUserLoggedIn()); | 579 EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
579 EXPECT_FALSE(connector_->IsEnterpriseManaged()); | 580 EXPECT_FALSE(connector_->IsEnterpriseManaged()); |
580 EXPECT_FALSE(prepared_profile_); | 581 EXPECT_FALSE(prepared_profile_); |
581 | 582 |
582 if (GetParam().enroll_device) { | 583 if (GetParam().enroll_device) { |
583 // Enroll the device. | 584 // Enroll the device. |
584 EnrollDevice(kUsername); | 585 EnrollDevice(kUsername); |
585 | 586 |
586 EXPECT_FALSE(user_manager->IsUserLoggedIn()); | 587 EXPECT_FALSE(user_manager->IsUserLoggedIn()); |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 {4, kUsernameOtherDomain, true}, | 700 {4, kUsernameOtherDomain, true}, |
700 {5, kUsernameOtherDomain, true}}; | 701 {5, kUsernameOtherDomain, true}}; |
701 | 702 |
702 INSTANTIATE_TEST_CASE_P(LoginUtilsBlockingLoginTestInstance, | 703 INSTANTIATE_TEST_CASE_P(LoginUtilsBlockingLoginTestInstance, |
703 LoginUtilsBlockingLoginTest, | 704 LoginUtilsBlockingLoginTest, |
704 testing::ValuesIn(kBlockinLoginTestCases)); | 705 testing::ValuesIn(kBlockinLoginTestCases)); |
705 | 706 |
706 } // namespace | 707 } // namespace |
707 | 708 |
708 } // namespace chromeos | 709 } // namespace chromeos |
OLD | NEW |