Remove gfx_unittests target in favor of ui_unittests

Removes the gfx_unittests target from various .gyp files in favor of
ui_unittests.  This can be landed once the master builders are restarted with
the change: https://chromiumcodereview.appspot.com/10778013

TEST=None
BUG=133864
R=tony@chromium.org, hbono@chromium.org, petermayo@chromium.org
TBR=ben@chromium.org

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

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

build/all.gyp

@@ -202,7 +202,6 @@
             '../content/content.gyp:content_browsertests',
             '../content/content.gyp:content_unittests',
             '../crypto/crypto.gyp:crypto_unittests',
-            '../ui/ui.gyp:gfx_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
             '../ipc/ipc.gyp:ipc_tests',
@@ -214,6 +213,7 @@
             '../sync/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
+            '../ui/ui.gyp:ui_unittests',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
           ],
         }],
@@ -359,7 +359,7 @@
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../content/content.gyp:content_browsertests',
             '../content/content.gyp:content_unittests',
-            '../ui/ui.gyp:gfx_unittests',
+            '../ui/ui.gyp:ui_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
@@ -387,7 +387,7 @@
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../content/content.gyp:content_browsertests',
             '../content/content.gyp:content_unittests',
-            '../ui/ui.gyp:gfx_unittests',
+            '../ui/ui.gyp:ui_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
@@ -434,7 +434,7 @@
             '../chrome/chrome.gyp:safe_browsing_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../content/content.gyp:content_unittests',
-            '../ui/ui.gyp:gfx_unittests',
+            '../ui/ui.gyp:ui_unittests',
             '../jingle/jingle.gyp:jingle_unittests',
             '../sql/sql.gyp:sql_unittests',
             '../sync/sync.gyp:sync_unit_tests',
@@ -475,7 +475,7 @@
             '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../courgette/courgette.gyp:courgette_unittests',
-            '../ui/ui.gyp:gfx_unittests',
+            '../ui/ui.gyp:ui_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
             '../ipc/ipc.gyp:ipc_tests',
             '../jingle/jingle.gyp:jingle_unittests',
@@ -612,13 +612,13 @@
           'dependencies': [
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chrome',
-            '../chrome/chrome.gyp:interactive_ui_tests',            
+            '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../content/content.gyp:content_browsertests',
             '../remoting/remoting.gyp:remoting_unittests',
             '../ui/aura/aura.gyp:*',
             '../ui/compositor/compositor.gyp:*',
-            '../ui/ui.gyp:gfx_unittests',
+            '../ui/ui.gyp:ui_unittests',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_unittests',
             '../webkit/webkit.gyp:pull_in_webkit_unit_tests',

tools/heapcheck/chrome_tests.py

@@ -101,7 +101,6 @@ class ChromeTests(object):
       "ui_unit": self.TestUIUnit,       "ui_unittests": self.TestUIUnit,
       "unit": self.TestUnit,            "unit_tests": self.TestUnit,
       "views": self.TestViews,          "views_unittests": self.TestViews,
-      "gfx": self.TestGfx,              "gfx_unittests": self.TestGfx,
     }
 
     if test not in self._test_list:
@@ -311,13 +310,6 @@ class ChromeTests(object):
   def TestViews(self):
     return self.SimpleTest("views", "views_unittests")
 
-  def TestGfx(self):
-    # Run ui_unittests, a successor of gfx_unittests, since gfx_unittests is
-    # deprecated.
-    # TODO(hbono): This is a band-aid fix. We need to change the master script
-    # so our bots run ui_unittests.
-    return self.SimpleTest("chrome", "ui_unittests")
-
   def TestLayoutChunk(self, chunk_num, chunk_size):
     '''Runs tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size).
 

tools/valgrind/chrome_tests.py

@@ -251,13 +251,6 @@ class ChromeTests:
   def TestFFmpegRegressions(self):
     return self.SimpleTest("chrome", "ffmpeg_regression_tests")
 
-  def TestGfx(self):
-    # Run ui_unittests, a successor of gfx_unittests, since gfx_unittests is
-    # deprecated.
-    # TODO(hbono): This is a band-aid fix. We need to change the master script
-    # so our bots run ui_unittests.
-    return self.SimpleTest("chrome", "ui_unittests")
-
   def TestGPU(self):
     return self.SimpleTest("gpu", "gpu_unittests")
 
@@ -510,7 +503,6 @@ class ChromeTests:
     "ui_unit": TestUIUnit,       "ui_unittests": TestUIUnit,
     "unit": TestUnit,            "unit_tests": TestUnit,
     "views": TestViews,          "views_unittests": TestViews,
-    "gfx": TestGfx,              "gfx_unittests": TestGfx,
   }
 
 

ui/gfx/image/image_unittest.cc

@@ -318,7 +318,7 @@ TEST_F(ImageTest, OwnershipTest) {
 }
 
 // Integration tests with UI toolkit frameworks require linking against the
-// Views library and cannot be here (gfx_unittests doesn't include it). They
+// Views library and cannot be here (ui_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace

ui/ui.gyp

@@ -765,36 +765,7 @@
       # TODO(ios): The ui tests do not compile yet on iOS.
       'includes': [
         'ui_unittests.gypi',
-      ],
-      'targets': [
-        {
-          # TODO(rsesek): Remove this target once ui_unittests is run on the
-          # waterfall instead of gfx_unittests.
-          'target_name': 'gfx_unittests',
-          'type': 'none',
-          'dependencies': [
-            'ui_unittests',
-          ],
-          'actions': [
-            {
-              'message': 'TEMPORARY: Copying ui_unittests to gfx_unittests',
-              'variables': {
-                'ui_copy_target': '<(PRODUCT_DIR)/ui_unittests<(EXECUTABLE_SUFFIX)',
-                'ui_copy_dest': '<(PRODUCT_DIR)/gfx_unittests<(EXECUTABLE_SUFFIX)',
-              },
-              'inputs': ['<(ui_copy_target)'],
-              'outputs': ['<(ui_copy_dest)'],
-              'action_name': 'TEMP_copy_ui_unittests',
-              'action': [
-                'python', '-c',
-                'import os, shutil; ' \
-                'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
-                'os.chmod(\'<(ui_copy_dest)\', 0700)'
-              ]
-            }
-          ],
-        },
-      ],
-    }],
+      ]},
+    ],
   ],
 }