Moving SwiftShader from component to bundled library

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

 // Copyright (c) 2012 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 371 matching lines @@
 }
 
 #endif  // BUILDFLAG(ENABLE_SUPERVISED_USERS)
 
 class ExtensionWebstoreGetWebGLStatusTest : public InProcessBrowserTest {
  protected:
   void RunTest(bool webgl_allowed) {
     // 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";
     static const char kWebGLStatusBlocked[] = "webgl_blocked";
     scoped_refptr<WebstorePrivateGetWebGLStatusFunction> function =
         new WebstorePrivateGetWebGLStatusFunction();
     std::unique_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
         function.get(), kEmptyArgs, browser()));
     ASSERT_TRUE(result);
     EXPECT_EQ(base::Value::Type::STRING, result->GetType());
@@ skipping 21 matching lines @@
       "      \"id\": 1,\n"
       "      \"features\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
   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);
 }
 
 }  // namespace extensions