Revert of ui: Move ui_unittests.gyp into ui/base.

chrome/chrome.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 425 matching lines @@
           # core unittests that are otherwise only accessible side-by-side with
           # chrome via all/all.sln.
           'target_name': 'test_targets',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_unittests',
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../content/content_shell_and_tests.gyp:content_shell',
             '../content/content_shell_and_tests.gyp:content_unittests',
             '../net/net.gyp:net_unittests',
-            '../ui/base/ui_base_tests.gyp:ui_unittests',
+            '../ui/ui_unittests.gyp:ui_unittests',
           ],
         },
         {
           'target_name': 'chrome_version_resources',
           'type': 'none',
           'conditions': [
             ['branding == "Chrome"', {
               'variables': {
                  'branding_path': 'app/theme/google_chrome/BRANDING',
               },
@@ skipping 314 matching lines @@
               'sources': [
                 'service/cloud_print/print_system_dummy.cc',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }