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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <memory> | 9 #include <memory> |
10 #include <string> | 10 #include <string> |
(...skipping 4060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4071 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, | 4071 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
4072 base::MakeUnique<base::FundamentalValue>(false), nullptr); | 4072 base::MakeUnique<base::FundamentalValue>(false), nullptr); |
4073 provider_.UpdateChromePolicy(policies); | 4073 provider_.UpdateChromePolicy(policies); |
4074 } | 4074 } |
4075 }; | 4075 }; |
4076 | 4076 |
4077 IN_PROC_BROWSER_TEST_F(HardwareAccelerationModePolicyTest, | 4077 IN_PROC_BROWSER_TEST_F(HardwareAccelerationModePolicyTest, |
4078 HardwareAccelerationDisabled) { | 4078 HardwareAccelerationDisabled) { |
4079 // Verifies that hardware acceleration can be disabled with policy. | 4079 // Verifies that hardware acceleration can be disabled with policy. |
4080 EXPECT_FALSE( | 4080 EXPECT_FALSE( |
4081 content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr)); | 4081 content::GpuDataManager::GetInstance()->GpuAccessAllowed(nullptr) && |
emaxx
2017/03/02 16:06:29
I'm not entirely following this. Is this changed b
sugoi1
2017/03/02 16:23:16
That's indeed the first line of GpuAccessAllowed()
sugoi
2017/03/06 18:31:42
After looking into this, I think this code is bett
emaxx
2017/03/06 20:10:51
I see, thanks for the explanation.
I'd still find
| |
4082 !content::GpuDataManager::GetInstance()->ShouldUseSwiftShader()); | |
4082 } | 4083 } |
4083 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) | 4084 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |
4084 | 4085 |
4085 #if defined(OS_CHROMEOS) | 4086 #if defined(OS_CHROMEOS) |
4086 // Policy is only available in ChromeOS | 4087 // Policy is only available in ChromeOS |
4087 IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) { | 4088 IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) { |
4088 // Verify that Unified Desktop can be enabled by policy | 4089 // Verify that Unified Desktop can be enabled by policy |
4089 display::DisplayManager* display_manager = | 4090 display::DisplayManager* display_manager = |
4090 ash::Shell::GetInstance()->display_manager(); | 4091 ash::Shell::GetInstance()->display_manager(); |
4091 | 4092 |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4413 | 4414 |
4414 SetEmptyPolicy(); | 4415 SetEmptyPolicy(); |
4415 // Policy not set. | 4416 // Policy not set. |
4416 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); | 4417 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); |
4417 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); | 4418 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); |
4418 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); | 4419 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); |
4419 } | 4420 } |
4420 #endif // defined(OS_CHROMEOS) | 4421 #endif // defined(OS_CHROMEOS) |
4421 | 4422 |
4422 } // namespace policy | 4423 } // namespace policy |
OLD | NEW |