cc: Move video upload to VideoResourceUpdater.

cc/trees/layer_tree_host_unittest_delegated.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/shared_quad_state.h"
@@ skipping 1085 matching lines @@
         EXPECT_EQ(2u, delegated_impl->Resources().size());
         EXPECT_EQ(1u, delegated_impl->Resources().count(map.find(999)->second));
         EXPECT_EQ(1u, delegated_impl->Resources().count(map.find(555)->second));
 
         // The 999 resource is sent to a grandparent compositor.
         ResourceProvider::ResourceIdArray resources_for_parent;
         resources_for_parent.push_back(map.find(999)->second);
         TransferableResourceArray transferable_resources;
         host_impl->resource_provider()->PrepareSendToParent(
             resources_for_parent, &transferable_resources);
+
+        resource_in_grandparent = transferable_resources[0];
+        EXPECT_EQ(map.find(999)->second, resource_in_grandparent.id);
         break;
       }
       case 2: {
         EXPECT_EQ(2u, map.size());
         EXPECT_EQ(1u, map.count(999));
         EXPECT_EQ(1u, map.count(555));
 
         /// 999 is in the parent, so not held by delegated renderer layer.
         EXPECT_EQ(1u, delegated_impl->Resources().size());
         EXPECT_EQ(1u, delegated_impl->Resources().count(map.find(555)->second));
 
         // Receive 999 back from the grandparent.
-        TransferableResource resource;
-        resource.id = map.find(999)->second;
+        EXPECT_EQ(map.find(999)->second, resource_in_grandparent.id);
         TransferableResourceArray transferable_resources;
-        transferable_resources.push_back(resource);
+        transferable_resources.push_back(resource_in_grandparent);
+
         host_impl->resource_provider()->ReceiveFromParent(
             transferable_resources);
         break;
       }
       case 3:
         // 999 should be released.
         EXPECT_EQ(1u, map.size());
         EXPECT_EQ(1u, map.count(555));
 
         EXPECT_EQ(1u, delegated_impl->Resources().size());
         EXPECT_EQ(1u, delegated_impl->Resources().count(map.find(555)->second));
     }
   }
 
   virtual void AfterTest() OVERRIDE {}
+
+  TransferableResource resource_in_grandparent;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestResourceSentToParent);
 
 class LayerTreeHostDelegatedTestCommitWithoutTake
     : public LayerTreeHostDelegatedTestCaseSingleDelegatedLayer {
  public:
   virtual void BeginTest() OVERRIDE {
     // Prevent drawing with resources that are sent to the grandparent.
     layer_tree_host()->SetViewportSize(gfx::Size(10, 10), gfx::Size());
@@ skipping 85 matching lines @@
     }
   }
 
   virtual void AfterTest() OVERRIDE {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestCommitWithoutTake);
 
 }  // namespace
 }  // namespace cc