Index: chrome/chrome_tests.gypi |
=================================================================== |
--- chrome/chrome_tests.gypi (revision 133969) |
+++ chrome/chrome_tests.gypi (working copy) |
@@ -1786,7 +1786,6 @@ |
'browser/ui/cocoa/history_menu_bridge_unittest.mm', |
'browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm', |
'browser/ui/cocoa/hover_image_button_unittest.mm', |
- 'browser/ui/cocoa/html_dialog_window_controller_unittest.mm', |
'browser/ui/cocoa/hung_renderer_controller_unittest.mm', |
'browser/ui/cocoa/hyperlink_button_cell_unittest.mm', |
'browser/ui/cocoa/hyperlink_text_view_unittest.mm', |
@@ -1845,6 +1844,7 @@ |
'browser/ui/cocoa/vertical_gradient_view_unittest.mm', |
'browser/ui/cocoa/view_resizer_pong.h', |
'browser/ui/cocoa/view_resizer_pong.mm', |
+ 'browser/ui/cocoa/web_dialog_window_controller_unittest.mm', |
'browser/ui/cocoa/web_intent_picker_test_base.h', |
'browser/ui/cocoa/web_intent_picker_test_base.mm', |
'browser/ui/cocoa/web_intent_sheet_controller_unittest.mm', |
@@ -1910,7 +1910,6 @@ |
'browser/ui/views/tabs/touch_tab_strip_layout_unittest.cc', |
'browser/ui/webui/chrome_web_ui_data_source_unittest.cc', |
'browser/ui/webui/fileicon_source_unittest.cc', |
- 'browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc', |
'browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2_unittest.cc', |
'browser/ui/webui/options2/language_options_handler2_unittest.cc', |
'browser/ui/webui/print_preview/print_preview_handler_unittest.cc', |
@@ -1918,6 +1917,7 @@ |
'browser/ui/webui/sync_internals_ui_unittest.cc', |
'browser/ui/webui/sync_setup_handler_unittest.cc', |
'browser/ui/webui/theme_source_unittest.cc', |
+ 'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc', |
'browser/ui/webui/web_ui_unittest.cc', |
'browser/ui/window_sizer_ash_unittest.cc', |
'browser/ui/window_sizer_unittest.cc', |
@@ -2463,7 +2463,7 @@ |
'browser/ui/browser_unittest.cc', |
'browser/ui/toolbar/toolbar_model_unittest.cc', |
'browser/ui/toolbar/wrench_menu_model_unittest.cc', |
- 'browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc', |
+ 'browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc', |
'browser/ui/window_sizer_unittest.cc', |
'test/base/browser_with_test_window_test.cc', |
'test/base/browser_with_test_window_test.h', |
@@ -2940,16 +2940,15 @@ |
'browser/ui/views/ash/caps_lock_handler_browsertest.cc', |
'browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc', |
'browser/ui/views/browser_actions_container_browsertest.cc', |
- 'browser/ui/views/html_dialog_view_browsertest.cc', |
'browser/ui/views/select_file_dialog_extension_browsertest.cc', |
'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc', |
+ 'browser/ui/views/web_dialog_view_browsertest.cc', |
'browser/ui/webui/chrome_url_data_manager_browsertest.cc', |
'browser/ui/webui/ntp/most_visited_browsertest.cc', |
'browser/ui/webui/test_chrome_web_ui_controller_factory_browsertest.cc', |
'browser/ui/webui/bidi_checker_web_ui_test.cc', |
'browser/ui/webui/bidi_checker_web_ui_test.h', |
'browser/ui/webui/extensions/extension_settings_browsertest.js', |
- 'browser/ui/webui/html_dialog_controller_browsertest.cc', |
'browser/ui/webui/net_internals/net_internals_ui_browsertest.cc', |
'browser/ui/webui/net_internals/net_internals_ui_browsertest.h', |
'browser/ui/webui/ntp/new_tab_ui_browsertest.cc', |
@@ -2965,8 +2964,9 @@ |
'browser/ui/webui/options2/password_manager2_browsertest.js', |
'browser/ui/webui/options2/search_engine_manager2_browsertest.js', |
'browser/ui/webui/sync_setup_browsertest.js', |
- 'browser/ui/webui/test_html_dialog_ui_delegate.cc', |
- 'browser/ui/webui/test_html_dialog_ui_delegate.h', |
+ 'browser/ui/webui/test_web_dialog_delegate.cc', |
+ 'browser/ui/webui/test_web_dialog_delegate.h', |
+ 'browser/ui/webui/web_dialog_controller_browsertest.cc', |
'browser/ui/webui/web_ui_browsertest.cc', |
'browser/ui/webui/web_ui_browsertest.h', |
'browser/ui/webui/web_ui_test_handler.cc', |
@@ -3279,7 +3279,7 @@ |
], |
'sources': [ |
# TODO(estade): port to win/mac. |
- 'browser/ui/webui/constrained_html_ui_browsertest.cc', |
+ 'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc', |
], |
}], |
['toolkit_uses_gtk == 1 or chromeos==1 or (OS=="linux" and use_aura==1)', { |
@@ -3349,7 +3349,7 @@ |
], |
'sources!': [ |
# TODO(estade): port to linux/views. |
- 'browser/ui/webui/constrained_html_ui_browsertest.cc', |
+ 'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc', |
], |
}, { # else: toolkit_views == 0 |
'sources!': [ |
@@ -3359,8 +3359,8 @@ |
'browser/ui/panels/panel_browser_view_browsertest.cc', |
'browser/ui/views/browser_actions_container_browsertest.cc', |
'browser/ui/views/crypto_module_password_dialog_view_unittest.cc', |
- 'browser/ui/views/html_dialog_view_browsertest.cc', |
'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc', |
+ 'browser/ui/views/web_dialog_view_browsertest.cc', |
], |
}], |
['target_arch!="arm"', { |