Moving SwiftShader from component to bundled library

chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

Index: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index a0a30f852d88ef2c2a92161741e16ed68759bf02..e8ea86f8757ca05cf4553429627aa86fce7c89a4 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -389,6 +389,8 @@ class ExtensionWebstoreGetWebGLStatusTest : public InProcessBrowserTest {
     // If Gpu access is disallowed then WebGL will not be available.
     if (!content::GpuDataManager::GetInstance()->GpuAccessAllowed(NULL))
       webgl_allowed = false;
+    if (content::GpuDataManager::GetInstance()->ShouldUseSwiftShader())
+      webgl_allowed = true;
 
     static const char kEmptyArgs[] = "[]";
     static const char kWebGLStatusAllowed[] = "webgl_allowed";
@@ -430,8 +432,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstoreGetWebGLStatusTest, Blocked) {
   gpu::GPUInfo gpu_info;
   content::GpuDataManager::GetInstance()->InitializeForTesting(
       json_blacklist, gpu_info);
-  EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted(
-      gpu::GPU_FEATURE_TYPE_WEBGL));
+  if (content::GpuDataManager::GetInstance()->ShouldUseSwiftShader()) {

[Devlin, 2017/03/01 23:47:24]

It seems strange that this change means the GpuDataManager no longer respects
the blacklist - why is that?

[sugoi1, 2017/03/02 00:17:08]

When WebGL is blacklisted on a given GPU, SwiftShader is automatically enabled
and is used to render WebGL. WebGL will now be available on 100% of Windows
machines, so it can't be disabled.

+    EXPECT_FALSE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted(

[Devlin, 2017/03/02 21:59:29]

nit: How about
content::GpuDataManager* gpu_manager = content::GpuDataManager::GetInstance();
EXPECT_EQ(gpu_manager->ShouldUseSwiftShader(),
          gpu_manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL);
          

[sugoi, 2017/03/06 18:31:42]

Done.

+        gpu::GPU_FEATURE_TYPE_WEBGL));
+  } else {
+    EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted(
+        gpu::GPU_FEATURE_TYPE_WEBGL));
+  }
 
   bool webgl_allowed = false;
   RunTest(webgl_allowed);