| 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 "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 5 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "chrome/browser/browser_process.h" | 28 #include "chrome/browser/browser_process.h" |
| 29 #include "chrome/browser/chrome_notification_types.h" | 29 #include "chrome/browser/chrome_notification_types.h" |
| 30 #include "chrome/browser/chromeos/login/login_manager_test.h" | 30 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 31 #include "chrome/browser/chromeos/login/startup_utils.h" | 31 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 32 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" | 32 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" |
| 33 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti
l.h" | 33 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_test_uti
l.h" |
| 34 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 34 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 35 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im
ages.h" | 35 #include "chrome/browser/chromeos/login/users/default_user_image/default_user_im
ages.h" |
| 36 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" | 36 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" |
| 37 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 37 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
| 38 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 38 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u
til.h" | 39 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u
til.h" |
| 39 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" | 40 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
| 40 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom
eos.h" | 41 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom
eos.h" |
| 41 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 42 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 43 #include "chrome/browser/chromeos/settings/stub_install_attributes.h" |
| 42 #include "chrome/browser/profiles/profile.h" | 44 #include "chrome/browser/profiles/profile.h" |
| 43 #include "chrome/browser/profiles/profile_downloader.h" | 45 #include "chrome/browser/profiles/profile_downloader.h" |
| 44 #include "chrome/browser/signin/account_tracker_service_factory.h" | 46 #include "chrome/browser/signin/account_tracker_service_factory.h" |
| 45 #include "chrome/common/chrome_paths.h" | 47 #include "chrome/common/chrome_paths.h" |
| 46 #include "chrome/test/base/in_process_browser_test.h" | 48 #include "chrome/test/base/in_process_browser_test.h" |
| 47 #include "chrome/test/base/testing_browser_process.h" | 49 #include "chrome/test/base/testing_browser_process.h" |
| 48 #include "chromeos/chromeos_paths.h" | 50 #include "chromeos/chromeos_paths.h" |
| 49 #include "chromeos/chromeos_switches.h" | 51 #include "chromeos/chromeos_switches.h" |
| 50 #include "chromeos/dbus/cryptohome_client.h" | 52 #include "chromeos/dbus/cryptohome_client.h" |
| 51 #include "chromeos/dbus/dbus_thread_manager.h" | 53 #include "chromeos/dbus/dbus_thread_manager.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 107 |
| 106 } // namespace | 108 } // namespace |
| 107 | 109 |
| 108 class UserImageManagerTest : public LoginManagerTest, | 110 class UserImageManagerTest : public LoginManagerTest, |
| 109 public user_manager::UserManager::Observer { | 111 public user_manager::UserManager::Observer { |
| 110 protected: | 112 protected: |
| 111 UserImageManagerTest() : LoginManagerTest(true) {} | 113 UserImageManagerTest() : LoginManagerTest(true) {} |
| 112 | 114 |
| 113 // LoginManagerTest overrides: | 115 // LoginManagerTest overrides: |
| 114 void SetUpInProcessBrowserTestFixture() override { | 116 void SetUpInProcessBrowserTestFixture() override { |
| 117 // Set up fake install attributes. |
| 118 std::unique_ptr<chromeos::StubInstallAttributes> attributes = |
| 119 base::MakeUnique<chromeos::StubInstallAttributes>(); |
| 120 attributes->SetEnterprise("fake-domain", "fake-id"); |
| 121 policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting( |
| 122 attributes.release()); |
| 123 |
| 115 LoginManagerTest::SetUpInProcessBrowserTestFixture(); | 124 LoginManagerTest::SetUpInProcessBrowserTestFixture(); |
| 116 | 125 |
| 117 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); | 126 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_)); |
| 118 ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_)); | 127 ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_)); |
| 119 } | 128 } |
| 120 | 129 |
| 121 void SetUpCommandLine(base::CommandLine* command_line) override { | 130 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 122 LoginManagerTest::SetUpCommandLine(command_line); | 131 LoginManagerTest::SetUpCommandLine(command_line); |
| 123 // These tests create new users and then inject policy after the fact, | 132 // These tests create new users and then inject policy after the fact, |
| 124 // to avoid having to set up a mock policy server. UserCloudPolicyManager | 133 // to avoid having to set up a mock policy server. UserCloudPolicyManager |
| (...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 saved_image = | 825 saved_image = |
| 817 test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load(); | 826 test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load(); |
| 818 ASSERT_TRUE(saved_image); | 827 ASSERT_TRUE(saved_image); |
| 819 | 828 |
| 820 // Check image dimensions. Images can't be compared since JPEG is lossy. | 829 // Check image dimensions. Images can't be compared since JPEG is lossy. |
| 821 EXPECT_EQ(policy_image_->width(), saved_image->width()); | 830 EXPECT_EQ(policy_image_->width(), saved_image->width()); |
| 822 EXPECT_EQ(policy_image_->height(), saved_image->height()); | 831 EXPECT_EQ(policy_image_->height(), saved_image->height()); |
| 823 } | 832 } |
| 824 | 833 |
| 825 } // namespace chromeos | 834 } // namespace chromeos |
| OLD | NEW |