Change all to build gles2_conform_test

BUG=83382


Review URL: https://chromiumcodereview.appspot.com/10826153

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150033 0039d316-1c4b-4281-b951-d872f2087c98

build/all.gyp

@@ -293,7 +293,7 @@
           'conditions': [
             ['internal_gles2_conform_tests', {
               'dependencies': [
-                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test_windowless',
+                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test',
               ],
             }], # internal_gles2_conform
           ],
@@ -308,7 +308,7 @@
           'conditions': [
             ['internal_gles2_conform_tests', {
               'dependencies': [
-                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test_windowless',
+                '../gpu/gles2_conform_test/gles2_conform_test.gyp:gles2_conform_test',
               ],
             }], # internal_gles2_conform
           ],