OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <string> | 6 #include <string> |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
667 }; | 667 }; |
668 | 668 |
669 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) { | 669 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) { |
670 RegisterUser(kTestUser1); | 670 RegisterUser(kTestUser1); |
671 chromeos::StartupUtils::MarkOobeCompleted(); | 671 chromeos::StartupUtils::MarkOobeCompleted(); |
672 } | 672 } |
673 | 673 |
674 // Verifies that the user image can be set through policy. Also verifies that | 674 // Verifies that the user image can be set through policy. Also verifies that |
675 // after the policy has been cleared, the user is able to choose a different | 675 // after the policy has been cleared, the user is able to choose a different |
676 // image. | 676 // image. |
677 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, SetAndClear) { | 677 // http://crbug.com/396352 |
| 678 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) { |
678 const user_manager::User* user = UserManager::Get()->FindUser(kTestUser1); | 679 const user_manager::User* user = UserManager::Get()->FindUser(kTestUser1); |
679 ASSERT_TRUE(user); | 680 ASSERT_TRUE(user); |
680 | 681 |
681 LoginUser(kTestUser1); | 682 LoginUser(kTestUser1); |
682 base::RunLoop().RunUntilIdle(); | 683 base::RunLoop().RunUntilIdle(); |
683 | 684 |
684 policy::CloudPolicyStore* store = GetStoreForUser(user); | 685 policy::CloudPolicyStore* store = GetStoreForUser(user); |
685 ASSERT_TRUE(store); | 686 ASSERT_TRUE(store); |
686 | 687 |
687 // Set policy. Verify that the policy-provided user image is downloaded, set | 688 // Set policy. Verify that the policy-provided user image is downloaded, set |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
875 | 876 |
876 saved_image = test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load(); | 877 saved_image = test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load(); |
877 ASSERT_TRUE(saved_image); | 878 ASSERT_TRUE(saved_image); |
878 | 879 |
879 // Check image dimensions. Images can't be compared since JPEG is lossy. | 880 // Check image dimensions. Images can't be compared since JPEG is lossy. |
880 EXPECT_EQ(policy_image_->width(), saved_image->width()); | 881 EXPECT_EQ(policy_image_->width(), saved_image->width()); |
881 EXPECT_EQ(policy_image_->height(), saved_image->height()); | 882 EXPECT_EQ(policy_image_->height(), saved_image->height()); |
882 } | 883 } |
883 | 884 |
884 } // namespace chromeos | 885 } // namespace chromeos |
OLD | NEW |