Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/browser/metrics_log.h

 // Copyright (c) 2006-2008 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_LOG_H__
 #define CHROME_BROWSER_METRICS_LOG_H__
 
@@ skipping 35 matching lines @@
 
   static const char* WindowEventTypeToString(WindowEventType type);
 
   void RecordWindowEvent(WindowEventType type, int window_id, int parent_id);
 
   // Records a page load.
   // window_id - the index of the tab in which the load took place
   // url - which URL was loaded
   // origin - what kind of action initiated the load
   // load_time - how long it took to load the page
-  void MetricsLog::RecordLoadEvent(int window_id,
-                                   const GURL& url,
-                                   PageTransition::Type origin,
-                                   int session_index,
-                                   TimeDelta load_time);
+  void RecordLoadEvent(int window_id,
+                       const GURL& url,
+                       PageTransition::Type origin,
+                       int session_index,
+                       TimeDelta load_time);
 
   // Records the current operating environment.  Takes the list of installed
   // plugins as a parameter because that can't be obtained synchronously
   // from the UI thread.
   // profile_metrics, if non-null, gives a dictionary of all profile metrics
   // that are to be recorded. Each value in profile_metrics should be a
   // dictionary giving the metrics for the profile.
   void RecordEnvironment(const std::vector<WebPluginInfo>& plugin_list,
                          const DictionaryValue* profile_metrics);
 
@@ skipping 104 matching lines @@
 
   xmlBufferPtr buffer_;
   xmlTextWriterPtr writer_;
   int num_events_;  // the number of events recorded in this log
 
   DISALLOW_EVIL_CONSTRUCTORS(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_LOG_H__