OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <map> | 5 #include <map> |
6 #include <set> | 6 #include <set> |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
798 | 798 |
799 content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED, | 799 content::WindowedNotificationObserver(chrome::NOTIFICATION_USER_LIST_CHANGED, |
800 base::Bind(&IsKnownUser, user_id_1_)) | 800 base::Bind(&IsKnownUser, user_id_1_)) |
801 .Wait(); | 801 .Wait(); |
802 EXPECT_TRUE(IsKnownUser(user_id_2_)); | 802 EXPECT_TRUE(IsKnownUser(user_id_2_)); |
803 | 803 |
804 CheckPublicSessionPresent(user_id_1_); | 804 CheckPublicSessionPresent(user_id_1_); |
805 CheckPublicSessionPresent(user_id_2_); | 805 CheckPublicSessionPresent(user_id_2_); |
806 } | 806 } |
807 | 807 |
808 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DisplayName) { | 808 // Flaky: http://crbug.com/512670. |
| 809 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) { |
809 UploadAndInstallDeviceLocalAccountPolicy(); | 810 UploadAndInstallDeviceLocalAccountPolicy(); |
810 AddPublicSessionToDevicePolicy(kAccountId1); | 811 AddPublicSessionToDevicePolicy(kAccountId1); |
811 | 812 |
812 WaitForPolicy(); | 813 WaitForPolicy(); |
813 | 814 |
814 // Verify that the display name is shown in the UI. | 815 // Verify that the display name is shown in the UI. |
815 const std::string get_compact_pod_display_name = base::StringPrintf( | 816 const std::string get_compact_pod_display_name = base::StringPrintf( |
816 "domAutomationController.send(document.getElementById('pod-row')" | 817 "domAutomationController.send(document.getElementById('pod-row')" |
817 " .getPodWithUsername_('%s').nameElement.textContent);", | 818 " .getPodWithUsername_('%s').nameElement.textContent);", |
818 user_id_1_.c_str()); | 819 user_id_1_.c_str()); |
(...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2342 ASSERT_TRUE(content::ExecuteScript(contents_, | 2343 ASSERT_TRUE(content::ExecuteScript(contents_, |
2343 "$('tos-accept-button').click();")); | 2344 "$('tos-accept-button').click();")); |
2344 | 2345 |
2345 WaitForSessionStart(); | 2346 WaitForSessionStart(); |
2346 } | 2347 } |
2347 | 2348 |
2348 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, | 2349 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, |
2349 TermsOfServiceDownloadTest, testing::Bool()); | 2350 TermsOfServiceDownloadTest, testing::Bool()); |
2350 | 2351 |
2351 } // namespace policy | 2352 } // namespace policy |
OLD | NEW |