Change the logic for discarding all non-histogram logs because of actions/omnibox events to truncat…

components/metrics/metrics_log.h

Index: components/metrics/metrics_log.h
diff --git a/components/metrics/metrics_log.h b/components/metrics/metrics_log.h
index 4f28b43b3aea02211acebfaa0faad61d615a088e..441cfbc26a0e6709aed40e8a63c6d493868e8f07 100644
--- a/components/metrics/metrics_log.h
+++ b/components/metrics/metrics_log.h
@@ -31,6 +31,11 @@ struct ActiveGroupId;
 
 namespace metrics {
 
+namespace internal {
+extern const int kOmniboxEventLimit;
+extern const int kUserActionEventLimit;
+}
+
 class MetricsProvider;
 class MetricsServiceClient;
 
@@ -128,6 +133,10 @@ class MetricsLog {
   // None of the Record* methods can be called after this is called.
   void CloseLog();
 
+  // Truncate some of the fields within the log that we want to restrict in
+  // size due to bandwidth concerns.
+  void TruncateEvents();
+
   // Fills |encoded_log| with the serialized protobuf representation of the
   // record.  Must only be called after CloseLog() has been called.
   void GetEncodedLog(std::string* encoded_log);
@@ -136,11 +145,6 @@ class MetricsLog {
     return creation_time_;
   }
 
-  int num_events() const {
-    return uma_proto_.omnibox_event_size() +
-           uma_proto_.user_action_event_size();
-  }
-
   LogType log_type() const { return log_type_; }
 
  protected: