Remove num_events_ member from MetricsLogBase.

components/metrics/metrics_log_base.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_BASE_H_
 #define COMPONENTS_METRICS_METRICS_LOG_BASE_H_
 
@@ skipping 52 matching lines @@
                             const base::HistogramSamples& snapshot);
 
   // Stop writing to this record and generate the encoded representation.
   // None of the Record* methods can be called after this is called.
   void CloseLog();
 
   // 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);
 
-  int num_events() { return num_events_; }
+  int num_events() const {
+    return uma_proto_.omnibox_event_size() +
+           uma_proto_.user_action_event_size();
+  }
 
   void set_hardware_class(const std::string& hardware_class) {
     uma_proto_.mutable_system_profile()->mutable_hardware()->set_hardware_class(
         hardware_class);
   }
 
   LogType log_type() const { return log_type_; }
 
  protected:
   bool locked() const { return locked_; }
 
   metrics::ChromeUserMetricsExtension* uma_proto() { return &uma_proto_; }
   const metrics::ChromeUserMetricsExtension* uma_proto() const {
     return &uma_proto_;
   }
 
-  // TODO(isherman): Remove this once the XML pipeline is outta here.
-  int num_events_;  // the number of events recorded in this log
-
  private:
   // locked_ is true when record has been packed up for sending, and should
   // no longer be written to.  It is only used for sanity checking and is
   // not a real lock.
   bool locked_;
 
   // The type of the log, i.e. initial or ongoing.
   const LogType log_type_;
 
   // Stores the protocol buffer representation for this log.
   metrics::ChromeUserMetricsExtension uma_proto_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLogBase);
 };
 
 }  // namespace metrics
 
 #endif  // COMPONENTS_METRICS_METRICS_LOG_BASE_H_