Revert 157168 - Add guards to metric values; erase bad events/metrics from db

chrome/browser/performance_monitor/startup_timer.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/performance_monitor/startup_timer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/performance_monitor/database.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
 namespace performance_monitor {
 
 namespace {
 // Needed because Database::AddMetric is overloaded, so base::Bind doesn't work.
 void AddMetricToDatabaseOnBackgroundThread(Database* database,
-                                           Metric metric) {
-  database->AddMetric(metric);
+                                           MetricType metric,
+                                           std::string value) {
+  database->AddMetric(metric, value);
 }
 
 }  // namespace
 
 // static
 StartupTimer* StartupTimer::g_startup_timer_ = NULL;
 
 StartupTimer::StartupTimer() : startup_begin_(base::TimeTicks::Now()),
                                startup_type_(STARTUP_NORMAL),
                                performance_monitor_initialized_(false) {
@@ skipping 70 matching lines @@
     g_startup_timer_->InsertElapsedSessionRestoreTime();
 }
 
 void StartupTimer::InsertElapsedStartupTime() {
   content::BrowserThread::PostBlockingPoolSequencedTask(
       Database::kDatabaseSequenceToken,
       FROM_HERE,
       base::Bind(
           &AddMetricToDatabaseOnBackgroundThread,
           base::Unretained(PerformanceMonitor::GetInstance()->database()),
-          Metric(startup_type_ == STARTUP_NORMAL ? METRIC_STARTUP_TIME
-                                                 : METRIC_TEST_STARTUP_TIME,
-                 base::Time::Now(),
-                 static_cast<double>(
-                     elapsed_startup_time_.ToInternalValue()))));
+          startup_type_ == STARTUP_NORMAL ? METRIC_STARTUP_TIME
+                                          : METRIC_TEST_STARTUP_TIME,
+          base::Int64ToString(elapsed_startup_time_.ToInternalValue())));
 }
 
 void StartupTimer::InsertElapsedSessionRestoreTime() {
   for (std::vector<base::TimeDelta>::const_iterator iter =
            elapsed_session_restore_times_.begin();
        iter != elapsed_session_restore_times_.end(); ++iter) {
     content::BrowserThread::PostBlockingPoolSequencedTask(
         Database::kDatabaseSequenceToken,
         FROM_HERE,
         base::Bind(
             &AddMetricToDatabaseOnBackgroundThread,
             base::Unretained(PerformanceMonitor::GetInstance()->database()),
-            Metric(METRIC_SESSION_RESTORE_TIME,
-                   base::Time::Now(),
-                   static_cast<double>(iter->ToInternalValue()))));
+            METRIC_SESSION_RESTORE_TIME,
+            base::Int64ToString(iter->ToInternalValue())));
   }
 }
 
 }  // namespace performance_monitor