Get the proper GPU Info in GpuProcessHost

content/browser/gpu/gpu_data_manager_impl_private_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 819 matching lines @@
   intel_gpu.active = true;
   gpu_info.secondary_gpus.push_back(intel_gpu);
 
   manager->InitializeForTesting(blacklist_json, gpu_info);
   TestObserver observer;
   manager->AddObserver(&observer);
 
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
+
+    // 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());
-  if (manager->ShouldUseSwiftShader()) {
-    EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
-              manager->GetBlacklistedFeatureCount());
-  } else {
+    // 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.
   EXPECT_TRUE(manager->UpdateActiveGpu(0x10de, 0x0640));
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.gpu_info_updated());
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
     EXPECT_EQ(0u, manager->GetBlacklistedFeatureCount());
   }
 
   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());
   }
 
   // Set Intel GPU to be active.
   EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.gpu_info_updated());
   if (manager->ShouldUseSwiftShader()) {
     EXPECT_EQ(static_cast<size_t>(gpu::NUMBER_OF_GPU_FEATURE_TYPES),
               manager->GetBlacklistedFeatureCount());
   } else {
     EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
   }
 }
 
 }  // namespace content