Index: chrome/test/BUILD.gn |
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
index cdad098765af8f9a09a60acaf708de01c8b341d6..5d23414650e2426790d1e54c9e32d773b16533e8 100644 |
--- a/chrome/test/BUILD.gn |
+++ b/chrome/test/BUILD.gn |
@@ -388,7 +388,7 @@ if (!is_android) { |
"../browser/ui/browser_focus_uitest.cc", |
"../browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm", |
"../browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.mm", |
- "../browser/ui/cocoa/website_settings/permission_bubble_cocoa_interactive_uitest.mm", |
+ "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm", |
"../browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc", |
"../browser/ui/exclusive_access/fullscreen_controller_interactive_browsertest.cc", |
"../browser/ui/exclusive_access/fullscreen_controller_state_interactive_browsertest.cc", |
@@ -1775,6 +1775,12 @@ test("browser_tests") { |
"../browser/ui/location_bar/location_bar_browsertest.cc", |
"../browser/ui/login/login_handler_browsertest.cc", |
"../browser/ui/native_window_tracker_browsertest.cc", |
+ "../browser/ui/permission_bubble/mock_permission_prompt.cc", |
+ "../browser/ui/permission_bubble/mock_permission_prompt.h", |
+ "../browser/ui/permission_bubble/mock_permission_prompt_factory.cc", |
+ "../browser/ui/permission_bubble/mock_permission_prompt_factory.h", |
+ "../browser/ui/permission_bubble/permission_bubble_browser_test_util.cc", |
+ "../browser/ui/permission_bubble/permission_bubble_browser_test_util.h", |
"../browser/ui/passwords/manage_passwords_test.cc", |
tapted
2017/03/16 08:20:41
This sorting isn't right. Everyone will get a pres
|
"../browser/ui/prefs/prefs_tab_helper_browsertest.cc", |
"../browser/ui/profile_error_browsertest.cc", |
@@ -1798,12 +1804,6 @@ test("browser_tests") { |
"../browser/ui/toolbar/mock_component_toolbar_actions_factory.h", |
"../browser/ui/update_chrome_dialog_browsertest.cc", |
"../browser/ui/views/hung_renderer_view_browsertest.cc", |
- "../browser/ui/website_settings/mock_permission_prompt.cc", |
- "../browser/ui/website_settings/mock_permission_prompt.h", |
- "../browser/ui/website_settings/mock_permission_prompt_factory.cc", |
- "../browser/ui/website_settings/mock_permission_prompt_factory.h", |
- "../browser/ui/website_settings/permission_bubble_browser_test_util.cc", |
- "../browser/ui/website_settings/permission_bubble_browser_test_util.h", |
"../browser/ui/webui/bidi_checker_web_ui_test.cc", |
"../browser/ui/webui/bidi_checker_web_ui_test.h", |
"../browser/ui/webui/bookmarks_ui_browsertest.cc", |
@@ -2553,13 +2553,13 @@ test("browser_tests") { |
"../browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm", |
"../browser/ui/cocoa/omnibox/omnibox_view_mac_browsertest.mm", |
"../browser/ui/cocoa/passwords/passwords_bubble_browsertest.mm", |
+ "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_browser_test.mm", |
"../browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm", |
"../browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac_browsertest.mm", |
"../browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm", |
"../browser/ui/cocoa/task_manager_mac_browsertest.mm", |
"../browser/ui/cocoa/view_id_util_browsertest.mm", |
"../browser/ui/cocoa/web_contents_modal_dialog_manager_views_mac_browsertest.mm", |
- "../browser/ui/cocoa/website_settings/permission_bubble_cocoa_browser_test.mm", |
] |
} |
} |
@@ -3374,6 +3374,10 @@ test("unit_tests") { |
"../browser/ui/find_bar/find_backend_unittest.cc", |
"../browser/ui/login/login_handler_unittest.cc", |
"../browser/ui/page_info/website_settings_unittest.cc", |
+ "../browser/ui/permission_bubble/mock_permission_prompt.cc", |
+ "../browser/ui/permission_bubble/mock_permission_prompt.h", |
+ "../browser/ui/permission_bubble/mock_permission_prompt_factory.cc", |
+ "../browser/ui/permission_bubble/mock_permission_prompt_factory.h", |
"../browser/ui/passwords/manage_passwords_state_unittest.cc", |
"../browser/ui/passwords/manage_passwords_view_utils_unittest.cc", |
"../browser/ui/passwords/password_manager_presenter_unittest.cc", |
@@ -3382,10 +3386,6 @@ test("unit_tests") { |
"../browser/ui/sync/sync_promo_ui_unittest.cc", |
"../browser/ui/tests/ui_gfx_image_unittest.cc", |
"../browser/ui/tests/ui_gfx_image_unittest.mm", |
- "../browser/ui/website_settings/mock_permission_prompt.cc", |
- "../browser/ui/website_settings/mock_permission_prompt.h", |
- "../browser/ui/website_settings/mock_permission_prompt_factory.cc", |
- "../browser/ui/website_settings/mock_permission_prompt_factory.h", |
"../browser/ui/webui/browsing_history_handler_unittest.cc", |
"../browser/ui/webui/fileicon_source_unittest.cc", |
"../browser/ui/webui/local_state/local_state_ui_unittest.cc", |
@@ -4664,6 +4664,7 @@ test("unit_tests") { |
"../browser/ui/cocoa/passwords/save_pending_password_view_controller_unittest.mm", |
"../browser/ui/cocoa/passwords/signin_promo_view_controller_unittest.mm", |
"../browser/ui/cocoa/passwords/update_pending_password_view_controller_unittest.mm", |
+ "../browser/ui/cocoa/permission_bubble/permission_bubble_controller_unittest.mm", |
"../browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm", |
"../browser/ui/cocoa/profiles/avatar_button_unittest.mm", |
"../browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm", |
@@ -4699,7 +4700,6 @@ test("unit_tests") { |
"../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/website_settings/permission_bubble_controller_unittest.mm", |
"../browser/ui/cocoa/window_size_autosaver_unittest.mm", |
] |
} |