STASH: Epic Experimental patch for toolkit-views App List on Mac

ui/app_list/test/run_all_unittests.cc

Index: ui/app_list/test/run_all_unittests.cc
diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc
index 19f0a0c873ccf89715c1ac87fb7570fa12b6c7cb..1a5644aa975cf13fa0b934e0440fef43c9589f77 100644
--- a/ui/app_list/test/run_all_unittests.cc
+++ b/ui/app_list/test/run_all_unittests.cc
@@ -12,7 +12,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
-#if !defined(OS_MACOSX)
+#if defined(TOOLKIT_VIEWS)
 #include "ui/gl/gl_surface.h"
 #endif
 
@@ -24,9 +24,7 @@ class AppListTestSuite : public base::TestSuite {
 
  protected:
   virtual void Initialize() override {
-#if !defined(OS_MACOSX)
     gfx::GLSurface::InitializeOneOffForTests();
-#endif
     base::TestSuite::Initialize();
     ui::RegisterPathProvider();