Aura: Have ui::Layer implement WebKit::WebExternalTextureLayerClient

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 0cace7a9d29c196fe95d35509f68eebd8b57489f..18237862b8724526212f9cf932340bf5ad2ea435 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -22,6 +22,7 @@
 #include "content/test/gpu/test_switches.h"
 #include "net/base/net_util.h"
 #include "ui/gl/gl_switches.h"
+#include "ui/compositor/compositor_setup.h"
 #if defined(OS_MACOSX)
 #include "ui/surface/io_surface_support_mac.h"
 #endif
@@ -66,6 +67,7 @@ class GpuFeatureTest : public InProcessBrowserTest {
       gpu_enabled_ = true;
     }
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
+    ui::DisableTestCompositor();
     command_line->AppendSwitchASCII(switches::kWindowSize, "400,300");
   }