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

chrome/browser/performance_monitor/database.h

 // 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.
 
 #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_
 #define CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_
 
 #include <vector>
 #include <set>
 #include <string>
@@ skipping 13 matching lines @@
 struct TimeRange {
   TimeRange();
   TimeRange(base::Time start_time, base::Time end_time);
   ~TimeRange();
 
   base::Time start;
   base::Time end;
 };
 
 class KeyBuilder;
-class DatabaseTestHelper;
 
 // The class supporting all performance monitor storage. This class wraps
 // multiple leveldb::DB objects. All methods must be called from a background
 // thread. Callers should use BrowserThread::PostBlockingPoolSequencedTask using
 // performance_monitor::kDBSequenceToken as the sequence token.
 //
 // Different schemas are used for the different leveldb::DB's based off of the
 // structure of the data and the common ways that it will need to be accessed.
 // The following specifies the schema of each type of leveldb::DB. Delimiters
 // are denoted with a '-'.
@@ skipping 101 matching lines @@
     return GetEvents(EVENT_UNDEFINED, base::Time(), clock_->GetTime());
   }
 
   EventTypeSet GetEventTypes(const base::Time& start, const base::Time& end);
 
   EventTypeSet GetEventTypes() {
     return GetEventTypes(base::Time(), clock_->GetTime());
   }
 
   // Add a metric instance to the database.
-  bool AddMetric(const std::string& activity, const Metric& metric);
+  bool AddMetric(const std::string& activity,
+                 MetricType metric_type,
+                 const std::string& value);
 
-  bool AddMetric(const Metric& metric) {
-    return AddMetric(kProcessChromeAggregate, metric);
+  bool AddMetric(MetricType metric_type, const std::string& value) {
+    return AddMetric(kProcessChromeAggregate, metric_type, value);
   }
 
   // Get the metrics that are active for the given process between |start|
   // (inclusive) and |end| (exclusive).
   MetricTypeSet GetActiveMetrics(const base::Time& start,
                                  const base::Time& end);
 
   // Get the activities that are active for the given metric after |start|.
   std::set<std::string> GetActiveActivities(MetricType metric_type,
                                             const base::Time& start);
@@ skipping 58 matching lines @@
   std::vector<TimeRange> GetActiveIntervals(const base::Time& start,
                                             const base::Time& end);
 
   FilePath path() const { return path_; }
 
   void set_clock(scoped_ptr<Clock> clock) {
     clock_ = clock.Pass();
   }
 
  private:
-  friend class DatabaseTestHelper;
+  FRIEND_TEST_ALL_PREFIXES(PerformanceMonitorDatabaseSetupTest, OpenClose);
+  FRIEND_TEST_ALL_PREFIXES(PerformanceMonitorDatabaseSetupTest, ActiveInterval);
 
   typedef std::map<std::string, std::string> RecentMap;
   typedef std::map<std::string, double> MaxValueMap;
 
   // By default, the database uses a clock that simply returns the current time.
   class SystemClock : public Clock {
    public:
     SystemClock() {}
     virtual ~SystemClock() {}
     virtual base::Time GetTime() OVERRIDE;
@@ skipping 52 matching lines @@
 
   leveldb::ReadOptions read_options_;
   leveldb::WriteOptions write_options_;
 
   DISALLOW_COPY_AND_ASSIGN(Database);
 };
 
 }  // namespace performance_monitor
 
 #endif  // CHROME_BROWSER_PERFORMANCE_MONITOR_DATABASE_H_