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

components/metrics/metrics_log.h

 // 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.
 
 // This file defines a set of user experience metrics data recorded by
 // the MetricsService.  This is the unit of data that is sent to the server.
 
 #ifndef COMPONENTS_METRICS_METRICS_LOG_H_
 #define COMPONENTS_METRICS_METRICS_LOG_H_
 
@@ skipping 13 matching lines @@
 namespace base {
 class HistogramSamples;
 }
 
 namespace variations {
 struct ActiveGroupId;
 }
 
 namespace metrics {
 
+namespace internal {
+extern const int kOmniboxEventLimit;
+extern const int kUserActionEventLimit;
+}
+
 class MetricsProvider;
 class MetricsServiceClient;
 
 class MetricsLog {
  public:
   enum LogType {
     INITIAL_STABILITY_LOG,  // The initial log containing stability stats.
     ONGOING_LOG,            // Subsequent logs in a session.
   };
 
@@ skipping 77 matching lines @@
       base::TimeDelta uptime);
 
   // Records general metrics based on the specified |metrics_providers|.
   void RecordGeneralMetrics(
       const std::vector<std::unique_ptr<MetricsProvider>>& metrics_providers);
 
   // Stop writing to this record and generate the encoded representation.
   // 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);
 
   const base::TimeTicks& creation_time() const {
     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:
   // Exposed for the sake of mocking/accessing in test code.
 
   // Fills |field_trial_ids| with the list of initialized field trials name and
   // group ids.
   virtual void GetFieldTrialIds(
       std::vector<variations::ActiveGroupId>* field_trial_ids) const;
 
@@ skipping 43 matching lines @@
   const base::TimeTicks creation_time_;
 
   PrefService* local_state_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 }  // namespace metrics
 
 #endif  // COMPONENTS_METRICS_METRICS_LOG_H_