Remove LatencyInfo::MergeWith()

Now that we have removed LatencyInfo merging throughout chrome, we
can remove the function LatencyInfo::MergeWith().

Also remove |dump_to_trace| from LatencyInfo::AddLatencyNumberWithTimestamp().
Previously |dump_to_trace| exists because when we merge two LatencyInfo by
calling A.MergeWith(B), we would add B's begin/terminal component into A, which
would accidentally cause TRACE_EVENT_ASYNC_BEGIN/END to be triggered on A. So
that we have |dump_to_trace| to guard against this. Now that we removed MergeWith, we
can also remove |dump_to_trace|.

BUG=246034
TEST=code still compiles.

Review URL: https://codereview.chromium.org/141473002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246288 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 6 deletions

diff --git a/ui/events/latency_info.h b/ui/events/latency_info.h
index 96f76fb..86ce7ec 100644
--- a/ui/events/latency_info.h
+++ b/ui/events/latency_info.h
@@ -98,9 +98,6 @@ struct EVENTS_BASE_EXPORT LatencyInfo {
   static bool Verify(const std::vector<LatencyInfo>& latency_info,
                      const char* referring_msg);
 
-  // Merges the contents of another LatencyInfo into this one.
-  void MergeWith(const LatencyInfo& other);
-
   // Add LatencyComponents that are in |other| but not in |this|.
   void AddNewLatencyFrom(const LatencyInfo& other);
 
@@ -112,13 +109,11 @@ struct EVENTS_BASE_EXPORT LatencyInfo {
 
   // Modifies the current sequence number and adds a certain number of events
   // for a specific component.
-  // TODO(miletus): Remove the |dump_to_trace| once we remove MergeWith().
   void AddLatencyNumberWithTimestamp(LatencyComponentType component,
                                      int64 id,
                                      int64 component_sequence_number,
                                      base::TimeTicks time,
-                                     uint32 event_count,
-                                     bool dump_to_trace);
+                                     uint32 event_count);
 
   // Returns true if the a component with |type| and |id| is found in
   // the latency_components and the component is stored to |output| if