| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/policy/display_rotation_default_handler.h" |
| 6 |
| 5 #include <stdint.h> | 7 #include <stdint.h> |
| 6 | 8 |
| 9 #include <memory> |
| 10 |
| 7 #include "ash/display/display_manager.h" | 11 #include "ash/display/display_manager.h" |
| 8 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 9 #include "base/bind.h" | 13 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 11 #include "base/location.h" | 15 #include "base/location.h" |
| 12 #include "base/macros.h" | 16 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | |
| 14 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
| 15 #include "base/run_loop.h" | 18 #include "base/run_loop.h" |
| 16 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 19 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 17 #include "chrome/browser/chromeos/policy/device_policy_builder.h" | 20 #include "chrome/browser/chromeos/policy/device_policy_builder.h" |
| 18 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 21 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
| 19 #include "chrome/browser/chromeos/policy/display_rotation_default_handler.h" | |
| 20 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 22 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
| 21 #include "chrome/browser/chromeos/settings/cros_settings.h" | 23 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 22 #include "chrome/browser/lifetime/application_lifetime.h" | 24 #include "chrome/browser/lifetime/application_lifetime.h" |
| 23 #include "chrome/test/base/in_process_browser_test.h" | 25 #include "chrome/test/base/in_process_browser_test.h" |
| 24 #include "chromeos/chromeos_switches.h" | 26 #include "chromeos/chromeos_switches.h" |
| 25 #include "chromeos/dbus/cryptohome_client.h" | 27 #include "chromeos/dbus/cryptohome_client.h" |
| 26 #include "chromeos/dbus/dbus_thread_manager.h" | 28 #include "chromeos/dbus/dbus_thread_manager.h" |
| 27 #include "chromeos/dbus/fake_cryptohome_client.h" | 29 #include "chromeos/dbus/fake_cryptohome_client.h" |
| 28 #include "chromeos/dbus/fake_session_manager_client.h" | 30 #include "chromeos/dbus/fake_session_manager_client.h" |
| 29 #include "chromeos/dbus/session_manager_client.h" | 31 #include "chromeos/dbus/session_manager_client.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 // Creates second display if there is none yet, or removes it if there is one. | 121 // Creates second display if there is none yet, or removes it if there is one. |
| 120 void ToggleSecondDisplay() { | 122 void ToggleSecondDisplay() { |
| 121 GetDisplayManager()->AddRemoveDisplay(); | 123 GetDisplayManager()->AddRemoveDisplay(); |
| 122 base::RunLoop run_loop; | 124 base::RunLoop run_loop; |
| 123 run_loop.RunUntilIdle(); | 125 run_loop.RunUntilIdle(); |
| 124 } | 126 } |
| 125 | 127 |
| 126 void RefreshPolicyAndWaitUntilDeviceSettingsUpdated() { | 128 void RefreshPolicyAndWaitUntilDeviceSettingsUpdated() { |
| 127 base::RunLoop run_loop; | 129 base::RunLoop run_loop; |
| 128 // For calls from SetPolicy(). | 130 // For calls from SetPolicy(). |
| 129 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> observer = | 131 std::unique_ptr<chromeos::CrosSettings::ObserverSubscription> observer = |
| 130 chromeos::CrosSettings::Get()->AddSettingsObserver( | 132 chromeos::CrosSettings::Get()->AddSettingsObserver( |
| 131 chromeos::kDisplayRotationDefault, run_loop.QuitClosure()); | 133 chromeos::kDisplayRotationDefault, run_loop.QuitClosure()); |
| 132 // For calls from SetADifferentPolicy(). | 134 // For calls from SetADifferentPolicy(). |
| 133 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> observer2 = | 135 std::unique_ptr<chromeos::CrosSettings::ObserverSubscription> observer2 = |
| 134 chromeos::CrosSettings::Get()->AddSettingsObserver( | 136 chromeos::CrosSettings::Get()->AddSettingsObserver( |
| 135 chromeos::kSystemUse24HourClock, run_loop.QuitClosure()); | 137 chromeos::kSystemUse24HourClock, run_loop.QuitClosure()); |
| 136 RefreshDevicePolicy(); | 138 RefreshDevicePolicy(); |
| 137 run_loop.Run(); | 139 run_loop.Run(); |
| 138 } | 140 } |
| 139 | 141 |
| 140 private: | 142 private: |
| 141 DISALLOW_COPY_AND_ASSIGN(DisplayRotationDefaultTest); | 143 DISALLOW_COPY_AND_ASSIGN(DisplayRotationDefaultTest); |
| 142 }; | 144 }; |
| 143 | 145 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 class DisplayRotationBootTest | 260 class DisplayRotationBootTest |
| 259 : public InProcessBrowserTest, | 261 : public InProcessBrowserTest, |
| 260 public testing::WithParamInterface<gfx::Display::Rotation> { | 262 public testing::WithParamInterface<gfx::Display::Rotation> { |
| 261 protected: | 263 protected: |
| 262 DisplayRotationBootTest() | 264 DisplayRotationBootTest() |
| 263 : fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {} | 265 : fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {} |
| 264 ~DisplayRotationBootTest() override {} | 266 ~DisplayRotationBootTest() override {} |
| 265 | 267 |
| 266 void SetUpInProcessBrowserTestFixture() override { | 268 void SetUpInProcessBrowserTestFixture() override { |
| 267 chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 269 chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
| 268 scoped_ptr<chromeos::SessionManagerClient>( | 270 std::unique_ptr<chromeos::SessionManagerClient>( |
| 269 fake_session_manager_client_)); | 271 fake_session_manager_client_)); |
| 270 chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( | 272 chromeos::DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( |
| 271 scoped_ptr<chromeos::CryptohomeClient>( | 273 std::unique_ptr<chromeos::CryptohomeClient>( |
| 272 new chromeos::FakeCryptohomeClient)); | 274 new chromeos::FakeCryptohomeClient)); |
| 273 | 275 |
| 274 test_helper_.InstallOwnerKey(); | 276 test_helper_.InstallOwnerKey(); |
| 275 test_helper_.MarkAsEnterpriseOwned(); | 277 test_helper_.MarkAsEnterpriseOwned(); |
| 276 } | 278 } |
| 277 | 279 |
| 278 chromeos::FakeSessionManagerClient* fake_session_manager_client_; | 280 chromeos::FakeSessionManagerClient* fake_session_manager_client_; |
| 279 policy::DevicePolicyCrosTestHelper test_helper_; | 281 policy::DevicePolicyCrosTestHelper test_helper_; |
| 280 }; | 282 }; |
| 281 | 283 |
| 282 IN_PROC_BROWSER_TEST_P(DisplayRotationBootTest, PRE_Reboot) { | 284 IN_PROC_BROWSER_TEST_P(DisplayRotationBootTest, PRE_Reboot) { |
| 283 const gfx::Display::Rotation policy_rotation = GetParam(); | 285 const gfx::Display::Rotation policy_rotation = GetParam(); |
| 284 const gfx::Display::Rotation user_rotation = gfx::Display::ROTATE_180; | 286 const gfx::Display::Rotation user_rotation = gfx::Display::ROTATE_180; |
| 285 | 287 |
| 286 // Set policy. | 288 // Set policy. |
| 287 policy::DevicePolicyBuilder* const device_policy( | 289 policy::DevicePolicyBuilder* const device_policy( |
| 288 test_helper_.device_policy()); | 290 test_helper_.device_policy()); |
| 289 em::ChromeDeviceSettingsProto& proto(device_policy->payload()); | 291 em::ChromeDeviceSettingsProto& proto(device_policy->payload()); |
| 290 proto.mutable_display_rotation_default()->set_display_rotation_default( | 292 proto.mutable_display_rotation_default()->set_display_rotation_default( |
| 291 static_cast<em::DisplayRotationDefaultProto::Rotation>(policy_rotation)); | 293 static_cast<em::DisplayRotationDefaultProto::Rotation>(policy_rotation)); |
| 292 base::RunLoop run_loop; | 294 base::RunLoop run_loop; |
| 293 scoped_ptr<chromeos::CrosSettings::ObserverSubscription> observer = | 295 std::unique_ptr<chromeos::CrosSettings::ObserverSubscription> observer = |
| 294 chromeos::CrosSettings::Get()->AddSettingsObserver( | 296 chromeos::CrosSettings::Get()->AddSettingsObserver( |
| 295 chromeos::kDisplayRotationDefault, run_loop.QuitClosure()); | 297 chromeos::kDisplayRotationDefault, run_loop.QuitClosure()); |
| 296 device_policy->SetDefaultSigningKey(); | 298 device_policy->SetDefaultSigningKey(); |
| 297 device_policy->Build(); | 299 device_policy->Build(); |
| 298 fake_session_manager_client_->set_device_policy(device_policy->GetBlob()); | 300 fake_session_manager_client_->set_device_policy(device_policy->GetBlob()); |
| 299 fake_session_manager_client_->OnPropertyChangeComplete(true); | 301 fake_session_manager_client_->OnPropertyChangeComplete(true); |
| 300 run_loop.Run(); | 302 run_loop.Run(); |
| 301 | 303 |
| 302 // Check the display's rotation. | 304 // Check the display's rotation. |
| 303 ash::DisplayManager* const display_manager = GetDisplayManager(); | 305 ash::DisplayManager* const display_manager = GetDisplayManager(); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 321 } | 323 } |
| 322 | 324 |
| 323 INSTANTIATE_TEST_CASE_P(PolicyDisplayRotationDefault, | 325 INSTANTIATE_TEST_CASE_P(PolicyDisplayRotationDefault, |
| 324 DisplayRotationBootTest, | 326 DisplayRotationBootTest, |
| 325 testing::Values(gfx::Display::ROTATE_0, | 327 testing::Values(gfx::Display::ROTATE_0, |
| 326 gfx::Display::ROTATE_90, | 328 gfx::Display::ROTATE_90, |
| 327 gfx::Display::ROTATE_180, | 329 gfx::Display::ROTATE_180, |
| 328 gfx::Display::ROTATE_270)); | 330 gfx::Display::ROTATE_270)); |
| 329 | 331 |
| 330 } // namespace policy | 332 } // namespace policy |
| OLD | NEW |