| Index: chrome/chrome_tests.gypi
 | 
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
 | 
| index a023122bdd9d3cda3f40f1d8b0b4b306f874bb07..133ae0b091489c5bc8c2a25fd005f0187f1c5cdd 100644
 | 
| --- a/chrome/chrome_tests.gypi
 | 
| +++ b/chrome/chrome_tests.gypi
 | 
| @@ -325,7 +325,7 @@
 | 
|          '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',
 | 
| @@ -368,7 +368,7 @@
 | 
|          }],
 | 
|          ['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',
 | 
|            ],
 | 
| @@ -1201,20 +1201,20 @@
 | 
|          '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',
 | 
| @@ -1779,15 +1779,15 @@
 | 
|              ['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',
 | 
|                ],
 | 
|              }],
 | 
|            ],
 | 
| @@ -1801,7 +1801,7 @@
 | 
|            ],
 | 
|          }, { # 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',
 | 
|              '../views/controls/textfield/textfield_views_model_unittest.cc',
 | 
| @@ -1832,7 +1832,7 @@
 | 
|              # 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',
 | 
| @@ -1951,7 +1951,7 @@
 | 
|              '../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/': [
 | 
| @@ -2135,7 +2135,7 @@
 | 
|          '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',
 | 
| @@ -2219,7 +2219,7 @@
 | 
|          ['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"', {
 | 
| 
 |