Introduce cc::LocalFrameId and use in SurfaceFactory

cc/surfaces/surface_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.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/scheduler_test_common.h"
@@ skipping 20 matching lines @@
  private:
   BeginFrameSource* begin_frame_source_;
 };
 
 TEST(SurfaceTest, SurfaceLifetime) {
   SurfaceManager manager;
   FakeSurfaceFactoryClient surface_factory_client;
   SurfaceFactory factory(kArbitraryFrameSinkId, &manager,
                          &surface_factory_client);
 
-  SurfaceId surface_id(kArbitraryFrameSinkId, 6, 0);
+  LocalFrameId local_frame_id(6, 0);
+  SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id);
   {
-    factory.Create(surface_id);
+    factory.Create(local_frame_id);
     EXPECT_TRUE(manager.GetSurfaceForId(surface_id));
-    factory.Destroy(surface_id);
+    factory.Destroy(local_frame_id);
   }
 
   EXPECT_EQ(NULL, manager.GetSurfaceForId(surface_id));
 }
 
 TEST(SurfaceTest, SurfaceIds) {
-  FrameSinkId frame_sink_ids[] = {FrameSinkId(0, 0), FrameSinkId(37, 37),
-                                  FrameSinkId(1337, 1234)};
   for (size_t i = 0; i < 3; ++i) {
-    const FrameSinkId& frame_sink_id = frame_sink_ids[i];
-    SurfaceIdAllocator allocator(frame_sink_id);
-    SurfaceId id1 = allocator.GenerateId();
-    EXPECT_EQ(id1.frame_sink_id(), frame_sink_id);
-    SurfaceId id2 = allocator.GenerateId();
-    EXPECT_EQ(id2.frame_sink_id(), frame_sink_id);
-    EXPECT_NE(id1.local_id(), id2.local_id());
-    EXPECT_NE(id1.nonce(), id2.nonce());
+    SurfaceIdAllocator allocator;
+    LocalFrameId id1 = allocator.GenerateId();
+    LocalFrameId id2 = allocator.GenerateId();
+    EXPECT_NE(id1, id2);
   }
 }
 
 }  // namespace
 }  // namespace cc