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

chrome/browser/performance_monitor/performance_monitor.cc

Index: chrome/browser/performance_monitor/performance_monitor.cc
===================================================================
--- chrome/browser/performance_monitor/performance_monitor.cc	(revision 157181)
+++ chrome/browser/performance_monitor/performance_monitor.cc	(working copy)
@@ -278,9 +278,10 @@
   database_->AddEvent(*event.get());
 }
 
-void PerformanceMonitor::AddMetricOnBackgroundThread(Metric metric) {
+void PerformanceMonitor::AddMetricOnBackgroundThread(MetricType type,
+                                                     const std::string& value) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
-  database_->AddMetric(metric);
+  database_->AddMetric(type, value);
 }
 
 void PerformanceMonitor::NotifyInitialized() {
@@ -311,9 +312,7 @@
       cpu_usage += iter->second->GetCPUUsage();
     }
 
-    database_->AddMetric(Metric(METRIC_CPU_USAGE,
-                                base::Time::Now(),
-                                cpu_usage));
+    database_->AddMetric(METRIC_CPU_USAGE, base::DoubleToString(cpu_usage));
   }
 }
 
@@ -332,12 +331,10 @@
     }
   }
 
-  database_->AddMetric(Metric(METRIC_PRIVATE_MEMORY_USAGE,
-                              base::Time::Now(),
-                              static_cast<double>(private_memory_sum)));
-  database_->AddMetric(Metric(METRIC_SHARED_MEMORY_USAGE,
-                              base::Time::Now(),
-                              static_cast<double>(shared_memory_sum)));
+  database_->AddMetric(METRIC_PRIVATE_MEMORY_USAGE,
+                       base::Uint64ToString(private_memory_sum));
+  database_->AddMetric(METRIC_SHARED_MEMORY_USAGE,
+                       base::Uint64ToString(shared_memory_sum));
 }
 
 void PerformanceMonitor::UpdateMetricsMapOnBackgroundThread() {
@@ -435,10 +432,8 @@
     PerformanceDataForIOThread performance_data_for_io_thread) {
   CHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   database_->AddMetric(
-      Metric(METRIC_NETWORK_BYTES_READ,
-             base::Time::Now(),
-             static_cast<double>(
-                 performance_data_for_io_thread.network_bytes_read)));
+      METRIC_NETWORK_BYTES_READ,
+      base::Uint64ToString(performance_data_for_io_thread.network_bytes_read));
 }
 
 void PerformanceMonitor::BytesReadOnIOThread(const net::URLRequest& request,
@@ -526,10 +521,8 @@
           base::Bind(
               &PerformanceMonitor::AddMetricOnBackgroundThread,
               base::Unretained(this),
-              Metric(METRIC_PAGE_LOAD_TIME,
-                     base::Time::Now(),
-                     static_cast<double>(
-                         load_details->load_time.ToInternalValue()))));
+              METRIC_PAGE_LOAD_TIME,
+              base::Int64ToString(load_details->load_time.ToInternalValue())));
       break;
     }
     default: {