Replaced is_null() with is_valid in SurfaceId and related classes.

cc/surfaces/surface_aggregator_unittest.cc

 // Copyright 2014 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/surfaces/surface_aggregator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 1928 matching lines @@
                                         size_t num_resource_ids,
                                         bool valid,
                                         SurfaceId child_id,
                                         SurfaceFactory* factory,
                                         SurfaceId surface_id) {
   std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
   std::unique_ptr<RenderPass> pass = RenderPass::Create();
   pass->id = RenderPassId(1, 1);
   SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   sqs->opacity = 1.f;
-  if (!child_id.is_null()) {
+  if (child_id.is_valid()) {
+    printf("Inside the if block.\n");
     SurfaceDrawQuad* surface_quad =
         pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
     surface_quad->SetNew(sqs, gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1),
                          child_id);
   }
 
   for (size_t i = 0u; i < num_resource_ids; ++i) {
     TransferableResource resource;
     resource.id = resource_ids[i];
     // ResourceProvider is software, so only software resources are valid.
@@ skipping 129 matching lines @@
   EXPECT_EQ(3u, resource_provider_->num_resources());
   factory.Destroy(local_frame1_id);
   factory.Destroy(local_frame2_id);
 }
 
 // Ensure that aggregator completely ignores Surfaces that reference invalid
 // resources.
 TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) {
   ResourceTrackingSurfaceFactoryClient client;
   SurfaceFactory factory(kArbitraryFrameSinkId, &manager_, &client);
-  LocalFrameId root_local_frame_id(7u, 0);
+  LocalFrameId root_local_frame_id(7u, 1);
   SurfaceId root_surface_id(kArbitraryFrameSinkId, root_local_frame_id);
   factory.Create(root_local_frame_id);
-  LocalFrameId middle_local_frame_id(8u, 0);
+  LocalFrameId middle_local_frame_id(8u, 1);
   SurfaceId middle_surface_id(kArbitraryFrameSinkId, middle_local_frame_id);
   factory.Create(middle_local_frame_id);
-  LocalFrameId child_local_frame_id(9u, 0);
+  LocalFrameId child_local_frame_id(9u, 1);
   SurfaceId child_surface_id(kArbitraryFrameSinkId, child_local_frame_id);
   factory.Create(child_local_frame_id);
 
   ResourceId ids[] = {14, 15, 16};
   SubmitCompositorFrameWithResources(ids, arraysize(ids), true, SurfaceId(),
                                      &factory, child_surface_id);
 
   ResourceId ids2[] = {17, 18, 19};
   SubmitCompositorFrameWithResources(ids2, arraysize(ids2), false,
                                      child_surface_id, &factory,
                                      middle_surface_id);
 
   ResourceId ids3[] = {20, 21, 22};
   SubmitCompositorFrameWithResources(ids3, arraysize(ids3), true,
                                      middle_surface_id, &factory,
                                      root_surface_id);
 
   CompositorFrame frame;
   frame = aggregator_->Aggregate(root_surface_id);
 
   RenderPassList* pass_list = &frame.delegated_frame_data->render_pass_list;
   ASSERT_EQ(1u, pass_list->size());
   EXPECT_EQ(1u, pass_list->back()->shared_quad_state_list.size());
   EXPECT_EQ(3u, pass_list->back()->quad_list.size());
-
+  printf("child_surface_id.is_valid() = %d\n", child_surface_id.is_valid());
   SubmitCompositorFrameWithResources(ids2, arraysize(ids), true,
                                      child_surface_id, &factory,
                                      middle_surface_id);
 
   frame = aggregator_->Aggregate(root_surface_id);
 
   pass_list = &frame.delegated_frame_data->render_pass_list;
   ASSERT_EQ(1u, pass_list->size());
   EXPECT_EQ(3u, pass_list->back()->shared_quad_state_list.size());
   EXPECT_EQ(9u, pass_list->back()->quad_list.size());
@@ skipping 67 matching lines @@
   // Output is insecure, so texture should be drawn.
   EXPECT_EQ(DrawQuad::SOLID_COLOR, render_pass->quad_list.back()->material);
 
   factory.Destroy(local_frame1_id);
   factory.Destroy(local_frame2_id);
 }
 
 }  // namespace
 }  // namespace cc