Move ui.gyp into ui/base/ directory.

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ab0d5d893a20f28b5c914ea61403f7a0f99ad9f4..586ed3233baed97df61440a7bbcaf0e01320f204 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -13,6 +13,7 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/accessibility/accessibility.gyp:ax_gen',
+        '../ui/base/ui_base.gyp:ui_base',
         '../ui/events/events.gyp:dom4_keycode_converter',
         '../ui/events/events.gyp:events_base',
         '../ui/events/events.gyp:events_test_support',
@@ -20,7 +21,6 @@
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/resources/ui_resources.gyp:ui_resources',
-        '../ui/ui.gyp:ui',
         '../url/url.gyp:url_lib',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         'content.gyp:content_app_both',
@@ -320,9 +320,9 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/re2/re2.gyp:re2',
         '../ui/accessibility/accessibility.gyp:accessibility',
+        '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/ui.gyp:ui',
       ],
       'include_dirs': [
         '..',
@@ -942,13 +942,13 @@
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/mesa/mesa.gyp:osmesa',
             '../ui/accessibility/accessibility.gyp:accessibility',
+            '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
             '../ui/snapshot/snapshot.gyp:snapshot',
-            '../ui/ui.gyp:ui',
             '../webkit/child/webkit_child.gyp:webkit_child',
             '../ui/accessibility/accessibility.gyp:ax_gen',
           ],
@@ -1194,11 +1194,11 @@
             '../base/base.gyp:test_support_base',
             '../gpu/gpu.gyp:command_buffer_common',
             '../testing/gtest.gyp:gtest',
+            '../third_party/WebKit/public/blink.gyp:blink',
+            '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
-            '../ui/ui.gyp:ui',
-            '../third_party/WebKit/public/blink.gyp:blink',
             # The following two dependencies provide the missing
             # symbol HeapProfilerStart in Linux component builds.
             '../webkit/child/webkit_child.gyp:webkit_child',
@@ -1226,11 +1226,11 @@
             'test_support_content',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
+            '../third_party/WebKit/public/blink.gyp:blink',
+            '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
-            '../ui/ui.gyp:ui',
-            '../third_party/WebKit/public/blink.gyp:blink',
             # The following two dependencies provide the missing
             # symbol HeapProfilerStart in Linux component builds.
             '../webkit/child/webkit_child.gyp:webkit_child',
@@ -1264,14 +1264,14 @@
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',
             'dependencies': [
-              'content.gyp:content',
               '../base/base.gyp:base',
-              '../testing/gtest.gyp:gtest',
               '../media/media.gyp:media',
-              '../ui/gl/gl.gyp:gl',
+              '../testing/gtest.gyp:gtest',
+              '../ui/base/ui_base.gyp:ui_base',
               '../ui/gfx/gfx.gyp:gfx',
               '../ui/gfx/gfx.gyp:gfx_geometry',
-              '../ui/ui.gyp:ui',
+              '../ui/gl/gl.gyp:gl',
+              'content.gyp:content',
             ],
             'include_dirs': [
               '<(DEPTH)/third_party/khronos',
@@ -1364,14 +1364,14 @@
           'target_name': 'video_encode_accelerator_unittest',
           'type': 'executable',
           'dependencies': [
-            'content.gyp:content',
             '../base/base.gyp:base',
-            '../testing/gtest.gyp:gtest',
             '../media/media.gyp:media',
-              '../ui/gl/gl.gyp:gl',
-              '../ui/gfx/gfx.gyp:gfx',
-              '../ui/gfx/gfx.gyp:gfx_geometry',
-              '../ui/ui.gyp:ui',
+            '../testing/gtest.gyp:gtest',
+            '../ui/base/ui_base.gyp:ui_base',
+            '../ui/gfx/gfx.gyp:gfx',
+            '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
+            'content.gyp:content',
           ],
           'sources': [
             'common/gpu/media/video_accelerator_unittest_helpers.h',