Move code in ui/gl/* from gfx:: to gl::

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 a7e9d514041844e31e897bd313ede99dcd02318d..99ce097169997616cd323e0d682cdaa72a432e99 100644
--- a/ui/gl/test/egl_initialization_displays_unittest.cc
+++ b/ui/gl/test/egl_initialization_displays_unittest.cc
@@ -11,22 +11,22 @@ TEST(EGLInitializationDisplaysTest, DisableD3D11) {
   std::unique_ptr<base::CommandLine> command_line(
       new base::CommandLine(base::CommandLine::NO_PROGRAM));
 
-  std::vector<gfx::DisplayType> displays;
+  std::vector<gl::DisplayType> displays;
 
   // using --disable-d3d11 with the default --use-angle should never return
   // D3D11.
   command_line->AppendSwitch(switches::kDisableD3D11);
   GetEGLInitDisplays(true, true, command_line.get(), &displays);
-  EXPECT_EQ(std::find(displays.begin(), displays.end(), gfx::ANGLE_D3D11),
+  EXPECT_EQ(std::find(displays.begin(), displays.end(), gl::ANGLE_D3D11),
             displays.end());
 
   // Specifically requesting D3D11 should always return it if the extension is
   // available
   command_line->AppendSwitchASCII(switches::kUseANGLE,
-                                  gfx::kANGLEImplementationD3D11Name);
+                                  gl::kANGLEImplementationD3D11Name);
   displays.clear();
   GetEGLInitDisplays(true, true, command_line.get(), &displays);
-  EXPECT_NE(std::find(displays.begin(), displays.end(), gfx::ANGLE_D3D11),
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_D3D11),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
 
@@ -34,7 +34,7 @@ TEST(EGLInitializationDisplaysTest, DisableD3D11) {
   // not available
   displays.clear();
   GetEGLInitDisplays(false, true, command_line.get(), &displays);
-  EXPECT_EQ(std::find(displays.begin(), displays.end(), gfx::ANGLE_D3D11),
+  EXPECT_EQ(std::find(displays.begin(), displays.end(), gl::ANGLE_D3D11),
             displays.end());
 }
 
@@ -42,23 +42,23 @@ TEST(EGLInitializationDisplaysTest, SwiftShader) {
   std::unique_ptr<base::CommandLine> command_line(
       new base::CommandLine(base::CommandLine::NO_PROGRAM));
 
-  std::vector<gfx::DisplayType> displays;
+  std::vector<gl::DisplayType> displays;
 
   // If swiftshader is requested, only SWIFT_SHADER should be returned
   command_line->AppendSwitchASCII(switches::kUseGL,
-                                  gfx::kGLImplementationSwiftShaderName);
+                                  gl::kGLImplementationSwiftShaderName);
   displays.clear();
   GetEGLInitDisplays(true, true, command_line.get(), &displays);
-  EXPECT_NE(std::find(displays.begin(), displays.end(), gfx::SWIFT_SHADER),
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::SWIFT_SHADER),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
 
   // Even if there are other flags, swiftshader should take prescedence
   command_line->AppendSwitchASCII(switches::kUseANGLE,
-                                  gfx::kANGLEImplementationD3D11Name);
+                                  gl::kANGLEImplementationD3D11Name);
   displays.clear();
   GetEGLInitDisplays(true, true, command_line.get(), &displays);
-  EXPECT_NE(std::find(displays.begin(), displays.end(), gfx::SWIFT_SHADER),
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::SWIFT_SHADER),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
 }
@@ -68,14 +68,14 @@ TEST(EGLInitializationDisplaysTest, DefaultRenderers) {
       new base::CommandLine(base::CommandLine::NO_PROGRAM));
 
   // Default without --use-angle flag
-  std::vector<gfx::DisplayType> default_no_flag_displays;
+  std::vector<gl::DisplayType> default_no_flag_displays;
   GetEGLInitDisplays(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,
-                                  gfx::kANGLEImplementationDefaultName);
-  std::vector<gfx::DisplayType> default_with_flag_displays;
+                                  gl::kANGLEImplementationDefaultName);
+  std::vector<gl::DisplayType> default_with_flag_displays;
   GetEGLInitDisplays(true, true, command_line.get(),
                      &default_with_flag_displays);
   EXPECT_FALSE(default_with_flag_displays.empty());
@@ -88,23 +88,23 @@ TEST(EGLInitializationDisplaysTest, NonDefaultRenderers) {
   std::unique_ptr<base::CommandLine> command_line(
       new base::CommandLine(base::CommandLine::NO_PROGRAM));
 
-  std::vector<gfx::DisplayType> displays;
+  std::vector<gl::DisplayType> displays;
 
   // OpenGL
   command_line->AppendSwitchASCII(switches::kUseANGLE,
-                                  gfx::kANGLEImplementationOpenGLName);
+                                  gl::kANGLEImplementationOpenGLName);
   displays.clear();
   GetEGLInitDisplays(true, true, command_line.get(), &displays);
-  EXPECT_NE(std::find(displays.begin(), displays.end(), gfx::ANGLE_OPENGL),
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_OPENGL),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
 
   // OpenGLES
   command_line->AppendSwitchASCII(switches::kUseANGLE,
-                                  gfx::kANGLEImplementationOpenGLESName);
+                                  gl::kANGLEImplementationOpenGLESName);
   displays.clear();
   GetEGLInitDisplays(true, true, command_line.get(), &displays);
-  EXPECT_NE(std::find(displays.begin(), displays.end(), gfx::ANGLE_OPENGLES),
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::ANGLE_OPENGLES),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
 }
@@ -114,9 +114,9 @@ TEST(EGLInitializationDisplaysTest, NoExtensions) {
       new base::CommandLine(base::CommandLine::NO_PROGRAM));
 
   // With no angle platform extensions, only DEFAULT should be available
-  std::vector<gfx::DisplayType> displays;
+  std::vector<gl::DisplayType> displays;
   GetEGLInitDisplays(false, false, command_line.get(), &displays);
-  EXPECT_NE(std::find(displays.begin(), displays.end(), gfx::DEFAULT),
+  EXPECT_NE(std::find(displays.begin(), displays.end(), gl::DEFAULT),
             displays.end());
   EXPECT_EQ(displays.size(), 1u);
 }