WIP Handle AwContents needing multiple live functors.

android_webview/browser/browser_view_renderer_unittest.cc

Index: android_webview/browser/browser_view_renderer_unittest.cc
diff --git a/android_webview/browser/browser_view_renderer_unittest.cc b/android_webview/browser/browser_view_renderer_unittest.cc
index 0eba0a82c17b8268e9e38db6ec8c1f22b9e7dbfa..0122c08d1990fee282604499c2281239d9dac892 100644
--- a/android_webview/browser/browser_view_renderer_unittest.cc
+++ b/android_webview/browser/browser_view_renderer_unittest.cc
@@ -123,6 +123,9 @@ class TestAnimateInAndOutOfScreen : public RenderingTest {
     ParentCompositorDrawConstraints constraints =
         GetCompositorFrameConsumer()->GetParentDrawConstraintsOnUI();
     switch (on_draw_count_) {
+      case 0u:
+        EXPECT_TRUE(DrawConstraintsEquals(constraints, initial_constraints_));

[boliu, 2016/05/05 21:40:32]

iirc leaving this out was a deliberate choice, this test does not ensure what
the state of parent constraint is at the beginning

[Tobias Sargeant, 2016/05/06 12:41:09]

We can remove the EXPECT_TRUE, however this CL adds in an
OnParentDrawConstraintsUpdated as soon as the producer is connected to a
consumer, so we get this call now on frame 0, whereas we didn't before, so the
case 0u: needs to be here because otherwuse we hit the default: FAIL().

+        break;
       case 1u:
         EXPECT_TRUE(DrawConstraintsEquals(constraints, new_constraints_));
         break;
@@ -334,6 +337,7 @@ class RenderThreadManagerDeletionTest : public ResourceRenderingTest {
 
   void CheckResults() override {
     OutputSurfaceResourceCountMap resource_counts;
+    browser_view_renderer_->SetCurrentCompositorFrameConsumer(nullptr);
     render_thread_manager_.reset();
     // Make sure resources for the last frame are returned.
     EXPECT_EQ(expected_return_count_, GetReturnedResourceCounts());