cc: Add main frame timing info to frame timing tracker.

cc/debug/frame_timing_tracker_unittest.cc

Index: cc/debug/frame_timing_tracker_unittest.cc
diff --git a/cc/debug/frame_timing_tracker_unittest.cc b/cc/debug/frame_timing_tracker_unittest.cc
index 85f571611ace7d527d7ec5f0d3e3126bd9a168e2..8d3ce1985718e379dc77cd384f87b500069810dc 100644
--- a/cc/debug/frame_timing_tracker_unittest.cc
+++ b/cc/debug/frame_timing_tracker_unittest.cc
@@ -37,14 +37,16 @@ static std::string ToString(
 
 TEST(FrameTimingTrackerTest, DefaultTrackerIsEmpty) {
   scoped_ptr<FrameTimingTracker> tracker(FrameTimingTracker::Create());
-  EXPECT_EQ("{\"values\":[]}", ToString(tracker->GroupCountsByRectId()));
+  EXPECT_EQ("{\"values\":[]}",
+            ToString(tracker->GroupCompositeCountsByRectId()));
 }
 
 TEST(FrameTimingTrackerTest, NoFrameIdsIsEmpty) {
   scoped_ptr<FrameTimingTracker> tracker(FrameTimingTracker::Create());
   std::vector<std::pair<int, int64_t>> ids;
   tracker->SaveTimeStamps(base::TimeTicks::FromInternalValue(100), ids);
-  EXPECT_EQ("{\"values\":[]}", ToString(tracker->GroupCountsByRectId()));
+  EXPECT_EQ("{\"values\":[]}",
+            ToString(tracker->GroupCompositeCountsByRectId()));
 }
 
 TEST(FrameTimingTrackerTest, OneFrameId) {
@@ -55,7 +57,7 @@ TEST(FrameTimingTrackerTest, OneFrameId) {
   EXPECT_EQ(
       "{\"values\":[{\"events\":["
       "{\"frame_id\":1,\"timestamp\":100}],\"rect_id\":2}]}",
-      ToString(tracker->GroupCountsByRectId()));
+      ToString(tracker->GroupCompositeCountsByRectId()));
 }
 
 TEST(FrameTimingTrackerTest, UnsortedTimestampsIds) {
@@ -70,7 +72,7 @@ TEST(FrameTimingTrackerTest, UnsortedTimestampsIds) {
       "{\"frame_id\":1,\"timestamp\":100},"
       "{\"frame_id\":1,\"timestamp\":200},"
       "{\"frame_id\":1,\"timestamp\":400}],\"rect_id\":2}]}",
-      ToString(tracker->GroupCountsByRectId()));
+      ToString(tracker->GroupCompositeCountsByRectId()));
 }
 
 TEST(FrameTimingTrackerTest, MultipleFrameIds) {
@@ -91,7 +93,7 @@ TEST(FrameTimingTrackerTest, MultipleFrameIds) {
   ids100.push_back(std::make_pair(3, 4));
   tracker->SaveTimeStamps(base::TimeTicks::FromInternalValue(100), ids100);
 
-  std::string result = ToString(tracker->GroupCountsByRectId());
+  std::string result = ToString(tracker->GroupCompositeCountsByRectId());
 
   EXPECT_EQ(strlen(
                 "{\"values\":[{\"events\":["