Reland 140814 - Rename ShellRenderView{,Host}Observer to LayoutTestController{,Host}
also hook up the stay on page after handling before unload flag.
Also removing incorrect references from aura/ui code to layout test controller stuff
BUG=111316
TEST=manual
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10538031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140862 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 588723e9..c8fc373 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -46,8 +46,12 @@
'..',
],
'sources': [
+ 'shell/layout_test_controller.cc',
+ 'shell/layout_test_controller.h',
'shell/layout_test_controller_bindings.cc',
'shell/layout_test_controller_bindings.h',
+ 'shell/layout_test_controller_host.cc',
+ 'shell/layout_test_controller_host.h',
'shell/paths_mac.h',
'shell/paths_mac.mm',
'shell/shell.cc',
@@ -92,10 +96,6 @@
'shell/shell_network_delegate.h',
'shell/shell_render_process_observer.cc',
'shell/shell_render_process_observer.h',
- 'shell/shell_render_view_host_observer.cc',
- 'shell/shell_render_view_host_observer.h',
- 'shell/shell_render_view_observer.cc',
- 'shell/shell_render_view_observer.h',
'shell/shell_resource_context.cc',
'shell/shell_resource_context.h',
'shell/shell_resource_dispatcher_host_delegate.cc',
