commit 79a92b5368fb4935e0b223a87f1d4552e4dbaf93
author boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Apr 08 19:09:02 2013
committer boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Apr 08 19:09:02 2013
tree a822cde4e2665c37c3fea95d91aa9f864a3d2545
parent aaead3a736537e8295c3e34bb100e70913855c16

Destroy InputHandlerManager after compositor thread

InputHandlerManager uses Unretained(this) to post tasks to compositor
thread which means it needs to outlive the compositor thread.

Added a test that is flaky without this fix.

BUG=226261


Review URL: https://chromiumcodereview.appspot.com/13650004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192857 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index c35a2c5..0c4212b 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -438,6 +438,7 @@
     compositor_output_surface_filter_ = NULL;
   }
 
+  compositor_thread_.reset();
   if (input_handler_manager_.get()) {
     RemoveFilter(input_handler_manager_->GetMessageFilter());
     input_handler_manager_.reset();