Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1800)

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

Issue 2715563002: Moving SwiftShader from component to bundled library (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
index 880a83fe77f85d13a6bc49778cb7ce6e6645addc..e32bbea0685c82ac69bdc3440275d2ccb625ad9f 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
@@ -313,13 +313,6 @@ TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering) {
EXPECT_FALSE(manager->ShouldUseSwiftShader());
manager->DisableHardwareAcceleration();
- EXPECT_FALSE(manager->GpuAccessAllowed(NULL));
- EXPECT_FALSE(manager->ShouldUseSwiftShader());
-
- // If SwiftShader is enabled, even if we blacklist GPU,
- // GPU process is still allowed.
- const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath"));
- manager->RegisterSwiftShaderPath(test_path);
EXPECT_TRUE(manager->ShouldUseSwiftShader());
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
@@ -335,12 +328,6 @@ TEST_F(GpuDataManagerImplPrivateTest, SwiftShaderRendering2) {
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
EXPECT_FALSE(manager->ShouldUseSwiftShader());
- const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath"));
- manager->RegisterSwiftShaderPath(test_path);
- EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
- EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
- EXPECT_FALSE(manager->ShouldUseSwiftShader());
-
manager->DisableHardwareAcceleration();
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
EXPECT_TRUE(manager->ShouldUseSwiftShader());
@@ -375,8 +362,6 @@ TEST_F(GpuDataManagerImplPrivateTest, NoGpuInfoUpdateWithSwiftShader) {
manager->InitializeForTesting("", gpu::GPUInfo());
manager->DisableHardwareAcceleration();
- const base::FilePath test_path(FILE_PATH_LITERAL("AnyPath"));
- manager->RegisterSwiftShaderPath(test_path);
EXPECT_TRUE(manager->ShouldUseSwiftShader());
EXPECT_TRUE(manager->GpuAccessAllowed(NULL));

Powered by Google App Engine
This is Rietveld 408576698