Fixes failing instrumentation tests on Nakasi

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index a7586d02309356c1eaf2ff01b681258a8eccc742..ac6eb1fd098fc433f0dd159799ef3b6d4c0523c3 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -553,12 +553,14 @@ void RenderWidgetHostViewAndroid::LockCompositingSurface() {
 }
 
 void RenderWidgetHostViewAndroid::UnlockCompositingSurface() {
-  if (!frame_evictor_->HasFrame() || locks_on_frame_count_ == 0)
+  if (!frame_evictor_->HasFrame()) {
+    DCHECK_EQ(locks_on_frame_count_, 0u);
     return;
+  }
 
   DCHECK(HasValidFrame());
-  frame_evictor_->UnlockFrame();
   locks_on_frame_count_--;
+  frame_evictor_->UnlockFrame();
 
   if (locks_on_frame_count_ == 0) {
     if (last_frame_info_) {
@@ -806,6 +808,7 @@ void RenderWidgetHostViewAndroid::RenderProcessGone(
 }
 
 void RenderWidgetHostViewAndroid::Destroy() {
+  host_->ViewDestroyed();
   RemoveLayers();
   SetContentViewCore(NULL);
 
@@ -1499,9 +1502,9 @@ void RenderWidgetHostViewAndroid::RequestDisallowInterceptTouchEvent() {
 }
 
 void RenderWidgetHostViewAndroid::EvictDelegatedFrame() {

[no sievers, 2016/03/21 21:42:44]

you can DCHECK_EQ(locks_on_frame_count_, 0u) here also.

[Jinsuk Kim, 2016/03/21 22:28:20]

Done.

+  frame_evictor_->DiscardedFrame();
   if (layer_.get())
     DestroyDelegatedContent();
-  frame_evictor_->DiscardedFrame();
 }
 
 bool RenderWidgetHostViewAndroid::HasAcceleratedSurface(