Expose Null ANGLE backend

ui/gl/test/egl_initialization_displays_unittest.cc

Index: ui/gl/test/egl_initialization_displays_unittest.cc
diff --git a/ui/gl/test/egl_initialization_displays_unittest.cc b/ui/gl/test/egl_initialization_displays_unittest.cc
index 99ce097169997616cd323e0d682cdaa72a432e99..5b16b92f09d539bfaff97930a23f067f0282a3c1 100644
--- a/ui/gl/test/egl_initialization_displays_unittest.cc
+++ b/ui/gl/test/egl_initialization_displays_unittest.cc
@@ -16,7 +16,7 @@ TEST(EGLInitializationDisplaysTest, DisableD3D11) {
   // using --disable-d3d11 with the default --use-angle should never return
   // D3D11.
   command_line->AppendSwitch(switches::kDisableD3D11);
-  GetEGLInitDisplays(true, true, command_line.get(), &displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
   EXPECT_EQ(std::find(displays.begin(), displays.end(), gl::ANGLE_D3D11),
             displays.end());
 
@@ -25,7 +25,7 @@ TEST(EGLInitializationDisplaysTest, DisableD3D11) {
   command_line->AppendSwitchASCII(switches::kUseANGLE,
                                   gl::kANGLEImplementationD3D11Name);
   displays.clear();
-  GetEGLInitDisplays(true, true, command_line.get(), &displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
   EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_D3D11),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
@@ -33,7 +33,7 @@ TEST(EGLInitializationDisplaysTest, DisableD3D11) {
   // Specifically requesting D3D11 should not return D3D11 if the extension is
   // not available
   displays.clear();
-  GetEGLInitDisplays(false, true, command_line.get(), &displays);
+  GetEGLInitDisplays(false, true, true, command_line.get(), &displays);
   EXPECT_EQ(std::find(displays.begin(), displays.end(), gl::ANGLE_D3D11),
             displays.end());
 }
@@ -48,7 +48,7 @@ TEST(EGLInitializationDisplaysTest, SwiftShader) {
   command_line->AppendSwitchASCII(switches::kUseGL,
                                   gl::kGLImplementationSwiftShaderName);
   displays.clear();
-  GetEGLInitDisplays(true, true, command_line.get(), &displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
   EXPECT_NE(std::find(displays.begin(), displays.end(), gl::SWIFT_SHADER),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
@@ -57,7 +57,7 @@ TEST(EGLInitializationDisplaysTest, SwiftShader) {
   command_line->AppendSwitchASCII(switches::kUseANGLE,
                                   gl::kANGLEImplementationD3D11Name);
   displays.clear();
-  GetEGLInitDisplays(true, true, command_line.get(), &displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
   EXPECT_NE(std::find(displays.begin(), displays.end(), gl::SWIFT_SHADER),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
@@ -69,14 +69,15 @@ TEST(EGLInitializationDisplaysTest, DefaultRenderers) {
 
   // Default without --use-angle flag
   std::vector<gl::DisplayType> default_no_flag_displays;
-  GetEGLInitDisplays(true, true, command_line.get(), &default_no_flag_displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(),
+                     &default_no_flag_displays);
   EXPECT_FALSE(default_no_flag_displays.empty());
 
   // Default with --use-angle flag
   command_line->AppendSwitchASCII(switches::kUseANGLE,
                                   gl::kANGLEImplementationDefaultName);
   std::vector<gl::DisplayType> default_with_flag_displays;
-  GetEGLInitDisplays(true, true, command_line.get(),
+  GetEGLInitDisplays(true, true, true, command_line.get(),
                      &default_with_flag_displays);
   EXPECT_FALSE(default_with_flag_displays.empty());
 
@@ -94,7 +95,7 @@ TEST(EGLInitializationDisplaysTest, NonDefaultRenderers) {
   command_line->AppendSwitchASCII(switches::kUseANGLE,
                                   gl::kANGLEImplementationOpenGLName);
   displays.clear();
-  GetEGLInitDisplays(true, true, command_line.get(), &displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
   EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_OPENGL),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
@@ -103,10 +104,19 @@ TEST(EGLInitializationDisplaysTest, NonDefaultRenderers) {
   command_line->AppendSwitchASCII(switches::kUseANGLE,
                                   gl::kANGLEImplementationOpenGLESName);
   displays.clear();
-  GetEGLInitDisplays(true, true, command_line.get(), &displays);
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
   EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_OPENGLES),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
+
+  // Null
+  command_line->AppendSwitchASCII(switches::kUseANGLE,
+                                  gl::kANGLEImplementationNullName);
+  displays.clear();
+  GetEGLInitDisplays(true, true, true, command_line.get(), &displays);
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_NULL),
+            displays.end());
+  EXPECT_EQ(displays.size(), 1u);
 }
 
 TEST(EGLInitializationDisplaysTest, NoExtensions) {
@@ -115,7 +125,7 @@ TEST(EGLInitializationDisplaysTest, NoExtensions) {
 
   // With no angle platform extensions, only DEFAULT should be available
   std::vector<gl::DisplayType> displays;
-  GetEGLInitDisplays(false, false, command_line.get(), &displays);
+  GetEGLInitDisplays(false, false, false, command_line.get(), &displays);
   EXPECT_NE(std::find(displays.begin(), displays.end(), gl::DEFAULT),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);