Get the proper GPU Info in GpuProcessHost

content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

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 0a239f3dc842c3d6c51774f836feed73e4989856..50cc99b22c357f8e9f1e5f9acd19025640aa8a59 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
@@ -837,22 +837,29 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
-  } else {
-    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
-  }
 
-  // Update with the same Intel GPU active.
-  EXPECT_FALSE(manager->UpdateActiveGpu(0x8086, 0x04a1));
-  {
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
-  EXPECT_FALSE(observer.gpu_info_updated());
-  if (manager->ShouldUseSwiftShader()) {
+    // Update to previous Intel GPU.
+    EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
+    {
+      base::RunLoop run_loop;
+      run_loop.RunUntilIdle();
+    }
+    EXPECT_TRUE(observer.gpu_info_updated());
+
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
     EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
+
+    // Update with the same Intel GPU active.
+    EXPECT_FALSE(manager->UpdateActiveGpu(0x8086, 0x04a1));
+    {
+      base::RunLoop run_loop;
+      run_loop.RunUntilIdle();
+    }
+    EXPECT_FALSE(observer.gpu_info_updated());
+
+    EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
   }
 
   // Set NVIDIA GPU to be active.
@@ -872,17 +879,24 @@ TEST_F(GpuDataManagerImplPrivateTest, UpdateActiveGpu) {
   observer.Reset();
   EXPECT_FALSE(observer.gpu_info_updated());
 
-  // Update with the same NVIDIA GPU active.
-  EXPECT_FALSE(manager->UpdateActiveGpu(0x10de, 0x0640));
-  {
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
-  EXPECT_FALSE(observer.gpu_info_updated());
   if (manager->ShouldUseSwiftShader()) {
+    // Update to previous NVIDIA GPU.
+    EXPECT_TRUE(manager->UpdateActiveGpu(0x10de, 0x0640));
+    {
+      base::RunLoop run_loop;
+      run_loop.RunUntilIdle();
+    }
+    EXPECT_TRUE(observer.gpu_info_updated());
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
+    // Update with the same NVIDIA GPU active.
+    EXPECT_FALSE(manager->UpdateActiveGpu(0x10de, 0x0640));
+    {
+      base::RunLoop run_loop;
+      run_loop.RunUntilIdle();
+    }
+    EXPECT_FALSE(observer.gpu_info_updated());
     EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
   }