Move chrome/browser/gtk/ to chrome/browser/ui/gtk/...

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 309 matching lines @@
       'sources': [
         'browser/accessibility/accessibility_mac_uitest.mm',
         'browser/autocomplete/autocomplete_edit_view_browsertest.cc',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_browsertest.cc',
         'browser/autofill/form_structure_browsertest.cc',
         'browser/browser_focus_uitest.cc',
         'browser/browser_keyevents_browsertest.cc',
         'browser/collected_cookies_uitest.cc',
         'browser/debugger/devtools_sanity_unittest.cc',
-        'browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
+        'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc',
         'browser/instant/instant_browsertest.cc',
         'browser/notifications/notifications_interactive_uitest.cc',
         'browser/ui/views/bookmark_bar_view_test.cc',
         'browser/ui/views/browser_keyboard_accessibility_test_win.cc',
         'browser/ui/views/find_bar_host_interactive_uitest.cc',
         'browser/ui/views/tabs/tab_dragging_test.cc',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
         'test/interactive_ui/fast_shutdown_interactive_uitest.cc',
         'test/interactive_ui/infobars_uitest.cc',
@@ skipping 20 matching lines @@
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
             'test/interactive_ui/npapi_interactive_test.cc',
             'test/interactive_ui/view_event_test_base.cc',
             'test/interactive_ui/view_event_test_base.h',
           ],
         }],
         ['OS=="linux" and toolkit_views==1', {
           'sources!': [
-            'browser/gtk/bookmark_bar_gtk_interactive_uitest.cc',
+            'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc',
             # TODO(port)
             'test/interactive_ui/npapi_interactive_test.cc',
           ],
         }],
         ['target_arch!="x64" and target_arch!="arm"', {
           'dependencies': [
             # run time dependency
             '../webkit/webkit.gyp:npapi_test_plugin',
           ],
         }],  # target_arch
@@ skipping 812 matching lines @@
         'browser/geolocation/network_location_provider_unittest.cc',
         'browser/geolocation/wifi_data_provider_common_unittest.cc',
         'browser/geolocation/wifi_data_provider_unittest_chromeos.cc',
         'browser/geolocation/wifi_data_provider_unittest_win.cc',
         'browser/geolocation/win7_location_api_unittest_win.cc',
         'browser/geolocation/win7_location_provider_unittest_win.cc',
         'browser/global_keyboard_shortcuts_mac_unittest.mm',
         'browser/google/google_update_settings_unittest.cc',
         'browser/google/google_url_tracker_unittest.cc',
         'browser/gpu_blacklist_unittest.cc',
-        'browser/gtk/accessibility_event_router_gtk_unittest.cc',
-        'browser/gtk/bookmark_bar_gtk_unittest.cc',
-        'browser/gtk/bookmark_editor_gtk_unittest.cc',
-        'browser/gtk/bookmark_utils_gtk_unittest.cc',
-        'browser/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
-        'browser/gtk/gtk_expanded_container_unittest.cc',
-        'browser/gtk/gtk_theme_provider_unittest.cc',
-        'browser/gtk/keyword_editor_view_unittest.cc',
-        'browser/gtk/options/content_exceptions_window_gtk_unittest.cc',
-        'browser/gtk/options/cookies_view_unittest.cc',
-        'browser/gtk/options/languages_page_gtk_unittest.cc',
-        'browser/gtk/reload_button_gtk_unittest.cc',
-        'browser/gtk/status_icons/status_tray_gtk_unittest.cc',
-        'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
+        'browser/ui/gtk/accessibility_event_router_gtk_unittest.cc',
+        'browser/ui/gtk/bookmark_bar_gtk_unittest.cc',
+        'browser/ui/gtk/bookmark_editor_gtk_unittest.cc',
+        'browser/ui/gtk/bookmark_utils_gtk_unittest.cc',
+        'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
+        'browser/ui/gtk/gtk_expanded_container_unittest.cc',
+        'browser/ui/gtk/gtk_theme_provider_unittest.cc',
+        'browser/ui/gtk/keyword_editor_view_unittest.cc',
+        'browser/ui/gtk/options/content_exceptions_window_gtk_unittest.cc',
+        'browser/ui/gtk/options/cookies_view_unittest.cc',
+        'browser/ui/gtk/options/languages_page_gtk_unittest.cc',
+        'browser/ui/gtk/reload_button_gtk_unittest.cc',
+        'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
+        'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
         'browser/history/expire_history_backend_unittest.cc',
         'browser/history/history_backend_unittest.cc',
         'browser/history/history_querying_unittest.cc',
         'browser/history/history_types_unittest.cc',
         'browser/history/history_unittest.cc',
         'browser/history/in_memory_url_index_unittest.cc',
         'browser/history/query_parser_unittest.cc',
         'browser/history/snippet_unittest.cc',
         'browser/history/starred_url_database_unittest.cc',
         'browser/history/text_database_manager_unittest.cc',
@@ skipping 544 matching lines @@
               ],
             }],
             ['selinux==0', {
               'dependencies': [
                 '../sandbox/sandbox.gyp:*',
               ],
             }],
             ['toolkit_views==1', {
               'sources!': [
                  'browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc',
-                 'browser/gtk/bookmark_bar_gtk_unittest.cc',
-                 'browser/gtk/bookmark_editor_gtk_unittest.cc',
-                 'browser/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
-                 'browser/gtk/gtk_expanded_container_unittest.cc',
-                 'browser/gtk/gtk_theme_provider_unittest.cc',
-                 'browser/gtk/options/cookies_view_unittest.cc',
-                 'browser/gtk/options/languages_page_gtk_unittest.cc',
-                 'browser/gtk/reload_button_gtk_unittest.cc',
-                 'browser/gtk/status_icons/status_tray_gtk_unittest.cc',
+                 'browser/ui/gtk/bookmark_bar_gtk_unittest.cc',
+                 'browser/ui/gtk/bookmark_editor_gtk_unittest.cc',
+                 'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
+                 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
+                 'browser/ui/gtk/gtk_theme_provider_unittest.cc',
+                 'browser/ui/gtk/options/cookies_view_unittest.cc',
+                 'browser/ui/gtk/options/languages_page_gtk_unittest.cc',
+                 'browser/ui/gtk/reload_button_gtk_unittest.cc',
+                 'browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc',
               ],
             }],
           ],
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
           'sources!': [
             'browser/printing/print_job_unittest.cc',
           ],
         }, { # else: OS != "linux"
           'sources!': [
-            'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
+            'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
             '../views/focus/accelerator_handler_gtk_unittest.cc',
           ],
         }],
         ['OS=="linux" or OS=="freebsd"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['OS=="mac"', {
            # The test fetches resources which means Mac need the app bundle to
            # exist on disk so it can pull from it.
           'dependencies': [
             'chrome',
             '../third_party/ocmock/ocmock.gyp:ocmock',
           ],
           'include_dirs': [
             '../third_party/GTM',
             '../third_party/GTM/AppKit',
           ],
           'sources!': [
             # Blocked on bookmark manager.
             'browser/bookmarks/bookmark_context_menu_controller_unittest.cc',
             'browser/ui/tabs/dock_info_unittest.cc',
-            'browser/gtk/reload_button_gtk_unittest.cc',
+            'browser/ui/gtk/reload_button_gtk_unittest.cc',
             'browser/password_manager/password_store_default_unittest.cc',
             'tools/convert_dict/convert_dict_unittest.cc',
             '../third_party/hunspell/google/hunspell_tests.cc',
           ],
           # TODO(mark): We really want this for all non-static library targets,
           # but when we tried to pull it up to the common.gypi level, it broke
           # other things like the ui, startup, and page_cycler tests. *shrug*
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
 
           # libwebcore.a is so large that ld may not have a sufficiently large
@@ skipping 98 matching lines @@
             'browser/ui/views/generic_info_view_unittest.cc',
             'browser/ui/views/keyword_editor_view_unittest.cc',
             'test/data/resource.rc',
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
           'sources!': [
-            'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
+            'browser/ui/gtk/tabs/tab_renderer_gtk_unittest.cc',
           ],
         }, { # else: toolkit_views == 0
           'sources/': [
             ['exclude', '^browser/ui/views/'],
             ['exclude', '^../views/'],
           ],
         }],
         ['use_openssl==1', {
           'sources/': [
             # OpenSSL build does not support firefox importer. See
@@ skipping 163 matching lines @@
         'browser/extensions/isolated_world_apitest.cc',
         'browser/extensions/notifications_apitest.cc',
         'browser/extensions/page_action_apitest.cc',
         'browser/extensions/permissions_apitest.cc',
         'browser/extensions/stubs_apitest.cc',
         'browser/extensions/window_open_apitest.cc',
         'browser/file_path_watcher/file_path_watcher_browsertest.cc',
         'browser/first_run/first_run_browsertest.cc',
         'browser/geolocation/access_token_store_browsertest.cc',
         'browser/geolocation/geolocation_browsertest.cc',
-        'browser/gtk/view_id_util_browsertest.cc',
+        'browser/ui/gtk/view_id_util_browsertest.cc',
         'browser/history/history_browsertest.cc',
         'browser/idbbindingutilities_browsertest.cc',
         'browser/in_process_webkit/dom_storage_browsertest.cc',
         'browser/in_process_webkit/indexed_db_browsertest.cc',
         'browser/net/cookie_policy_browsertest.cc',
         'browser/net/ftp_browsertest.cc',
         'browser/plugin_service_browsertest.cc',
         'browser/policy/device_management_backend_mock.cc',
         'browser/policy/device_management_backend_mock.h',
         'browser/policy/device_management_service_browsertest.cc',
@@ skipping 63 matching lines @@
           ],
         }],
         ['internal_pdf', {
           'sources': [
             'test/plugin/pdf_browsertest.cc',
           ],
         }],
         ['OS!="linux" or toolkit_views==1', {
           'sources!': [
             'browser/extensions/browser_action_test_util_gtk.cc',
-            'browser/gtk/view_id_util_browsertest.cc',
+            'browser/ui/gtk/view_id_util_browsertest.cc',
           ],
         }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
@@ skipping 1405 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: