Merge 165866 - Disable threaded compositing when texture sharing is blacklisted

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc	(revision 165954)
+++ chrome/test/gpu/gpu_feature_browsertest.cc	(working copy)
@@ -44,6 +44,7 @@
 const char kSwapBuffersEvent[] = "SwapBuffers";
 const char kAcceleratedCanvasCreationEvent[] = "Canvas2DLayerBridgeCreation";
 const char kWebGLCreationEvent[] = "DrawingBufferCreation";
+const char kThreadedCompositingEvent[] = "ThreadedCompositingInitialization";
 
 class GpuFeatureTest : public InProcessBrowserTest {
  public:
@@ -226,6 +227,30 @@
   RunEventTest(url, kSwapBuffersEvent, false);
 }
 
+IN_PROC_BROWSER_TEST_F(GpuFeatureTest, ThreadedCompositingTextureSharing) {
+  const std::string json_blacklist =
+      "{\n"
+      "  \"name\": \"gpu blacklist\",\n"
+      "  \"version\": \"1.0\",\n"
+      "  \"entries\": [\n"
+      "    {\n"
+      "      \"id\": 1,\n"
+      "      \"blacklist\": [\n"
+      "        \"texture_sharing\"\n"
+      "      ]\n"
+      "    }\n"
+      "  ]\n"
+      "}";
+  SetupBlacklist(json_blacklist);
+  GpuFeatureType type =
+      GpuDataManager::GetInstance()->GetBlacklistedFeatures();
+  type = IgnoreGpuFeatures(type);
+  EXPECT_EQ(type, content::GPU_FEATURE_TYPE_TEXTURE_SHARING);
+
+  const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
+  RunEventTest(url, kThreadedCompositingEvent, false);
+}
+
 class AcceleratedCompositingTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {