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

chrome/browser/metrics_service.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 service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_BROWSER_METRICS_SERVICE_H__
 #define CHROME_BROWSER_METRICS_SERVICE_H__
 
@@ skipping 138 matching lines @@
   static void AddOrRemoveObserver(NotificationObserver* observer,
                                   NotificationType type,
                                   bool is_add);
 
   // Deletes pending_log_ and current_log_, and pushes their text into the
   // appropriate unsent_log vectors.
   void PushPendingLogsToUnsentLists();
 
   // Save the pending_log_text_ persistently in a pref for transmission when we
   // next run.  Note that IF this text is "too large," we just dicard it.
-  void MetricsService::PushPendingLogTextToUnsentOngoingLogs();
+  void PushPendingLogTextToUnsentOngoingLogs();
 
   // Start timer for next log transmission.
   void StartLogTransmissionTimer();
   // Do not call TryToStartTransmission() directly.
   // Use StartLogTransmissionTimer() to schedule a call.
   void TryToStartTransmission();
   // Internal function to collect process memory information.
   void CollectMemoryDetails();
   // Check to see if there is a log that needs to be, or is being, transmitted.
   bool pending_log() const {
@@ skipping 180 matching lines @@
 
   // Indicate that a timer for sending the next log has already been queued,
   // or that a URLFetch (i.e., log transmission) is in progress.
   bool timer_pending_;
 
   DISALLOW_EVIL_CONSTRUCTORS(MetricsService);
 };
 
 #endif  // CHROME_BROWSER_METRICS_SERVICE_H__