Merge 49197 - Submitting CL http://codereview.chromium.org/2324001 on behalf ...

chrome/browser/metrics/metrics_log.h

 // Copyright (c) 2010 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 CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 
@@ skipping 77 matching lines @@
   // record.  They can only be called after CloseLog() has been called.
   // GetEncodedLog returns false if buffer_size is less than
   // GetEncodedLogSize();
   int GetEncodedLogSize();
   bool GetEncodedLog(char* buffer, int buffer_size);
 
   // Returns the amount of time in seconds that this log has been in use.
   int GetElapsedSeconds();
 
   int num_events() { return num_events_; }
+  void set_hardware_class(const std::string& hardware_class) {
+    hardware_class_ = hardware_class;
+  }
 
   // Creates an MD5 hash of the given value, and returns hash as a byte
   // buffer encoded as a std::string.
   static std::string CreateHash(const std::string& value);
 
   // Return a base64-encoded MD5 hash of the given string.
   static std::string CreateBase64Hash(const std::string& string);
 
   // Get the current version of the application as a string.
   static std::string GetVersionString();
 
   // Get the GMT buildtime for the current binary, expressed in seconds since
-  // Januray 1, 1970 GMT.
+  // January 1, 1970 GMT.
   // The value is used to identify when a new build is run, so that previous
   // reliability stats, from other builds, can be abandoned.
   static int64 GetBuildTime();
 
   // Get the amount of uptime in seconds since this function was last called.
   // This updates the cumulative uptime metric for uninstall as a side effect.
   static int64 GetIncrementalUptime(PrefService* pref);
 
   // Use |extension| in all uploaded appversions in addition to the standard
   // version string.
   static void set_version_extension(const std::string& extension) {
     version_extension_ = extension;
   }
+
  protected:
   // Returns a string containing the current time.
   // Virtual so that it can be overridden for testing.
   virtual std::string GetCurrentTimeString();
 
  private:
   // Helper class that invokes StartElement from constructor, and EndElement
   // from destructor.
   //
   // Use the macro OPEN_ELEMENT_FOR_SCOPE to help avoid usage problems.
@@ skipping 13 matching lines @@
       log_->EndElement();
     }
 
    private:
      MetricsLog* log_;
   };
   friend class ScopedElement;
 
   static const char* WindowEventTypeToString(WindowEventType type);
 
+  // Frees the resources allocated by the XML document writer: the
+  // main writer object as well as the XML tree structure, if
+  // applicable.
+  void FreeDocWriter();
+
   // Convenience versions of xmlWriter functions
   void StartElement(const char* name);
   void EndElement();
   void WriteAttribute(const std::string& name, const std::string& value);
   void WriteIntAttribute(const std::string& name, int value);
   void WriteInt64Attribute(const std::string& name, int64 value);
 
   // Write the attributes that are common to every metrics event type.
   void WriteCommonEventAttributes();
 
@@ skipping 33 matching lines @@
                            const DictionaryValue& profile_metrics);
 
   // An extension that is appended to the appversion in each log.
   static std::string version_extension_;
 
   base::Time start_time_;
   base::Time end_time_;
 
   std::string client_id_;
   std::string session_id_;
+  std::string hardware_class_;
 
   // 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_;
 
+  xmlDocPtr doc_;
   xmlBufferPtr buffer_;
   xmlTextWriterPtr writer_;
   int num_events_;  // the number of events recorded in this log
 
   DISALLOW_EVIL_CONSTRUCTORS(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_