Index: cc/output/overlay_unittest.cc |
diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc |
index dd325bd0c5a26b8ae5d2836542d8c2bceab5704c..92c7a281430e0d01a7a2087f6461459bdf3c01aa 100644 |
--- a/cc/output/overlay_unittest.cc |
+++ b/cc/output/overlay_unittest.cc |
@@ -3,7 +3,6 @@ |
// found in the LICENSE file. |
#include "cc/base/region.h" |
-#include "cc/base/scoped_ptr_vector.h" |
#include "cc/output/compositor_frame_metadata.h" |
#include "cc/output/gl_renderer.h" |
#include "cc/output/output_surface.h" |
@@ -314,8 +313,8 @@ static void CompareRenderPassLists(const RenderPassList& expected_list, |
const RenderPassList& actual_list) { |
EXPECT_EQ(expected_list.size(), actual_list.size()); |
for (size_t i = 0; i < actual_list.size(); ++i) { |
- RenderPass* expected = expected_list[i]; |
- RenderPass* actual = actual_list[i]; |
+ RenderPass* expected = expected_list[i].get(); |
+ RenderPass* actual = actual_list[i].get(); |
EXPECT_EQ(expected->id, actual->id); |
EXPECT_EQ(expected->output_rect, actual->output_rect); |
@@ -423,7 +422,7 @@ TEST_F(SandwichTest, SuccessfulSingleOverlay) { |
ASSERT_EQ(1U, pass_list.size()); |
ASSERT_EQ(1U, candidate_list.size()); |
- RenderPass* main_pass = pass_list.back(); |
+ RenderPass* main_pass = pass_list.back().get(); |
// Check that the quad is gone. |
EXPECT_EQ(2U, main_pass->quad_list.size()); |
const QuadList& quad_list = main_pass->quad_list; |
@@ -562,7 +561,7 @@ TEST_F(SandwichTest, SuccessfulSandwichOverlay) { |
ASSERT_EQ(1U, pass_list.size()); |
ASSERT_EQ(2U, candidate_list.size()); |
- RenderPass* main_pass = pass_list.back(); |
+ RenderPass* main_pass = pass_list.back().get(); |
// Check that the quad is gone. |
EXPECT_EQ(3U, main_pass->quad_list.size()); |
const QuadList& quad_list = main_pass->quad_list; |
@@ -609,7 +608,7 @@ TEST_F(SandwichTest, MultiQuadOverlay) { |
pass_list.push_back(pass.Pass()); |
// Run the overlay strategy on that input. |
- RenderPass* main_pass = pass_list.back(); |
+ RenderPass* main_pass = pass_list.back().get(); |
OverlayCandidateList candidate_list; |
EXPECT_EQ(4U, main_pass->quad_list.size()); |
overlay_processor_->ProcessForOverlays(resource_provider_.get(), &pass_list, |
@@ -703,7 +702,7 @@ TEST_F(SingleOverlayOnTopTest, SuccessfullOverlay) { |
ASSERT_EQ(1U, pass_list.size()); |
ASSERT_EQ(1U, candidate_list.size()); |
- RenderPass* main_pass = pass_list.back(); |
+ RenderPass* main_pass = pass_list.back().get(); |
// Check that the quad is gone. |
EXPECT_EQ(2U, main_pass->quad_list.size()); |
const QuadList& quad_list = main_pass->quad_list; |