Revert of Change WebRTC SslCipher to be exposed as number only.

talk/app/webrtc/fakemetricsobserver.cc

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 19 matching lines @@
 
 namespace webrtc {
 
 FakeMetricsObserver::FakeMetricsObserver() {
   Reset();
 }
 
 void FakeMetricsObserver::Reset() {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   counters_.clear();
-  memset(histogram_samples_, 0, sizeof(histogram_samples_));
+  memset(int_histogram_samples_, 0, sizeof(int_histogram_samples_));
+  for (std::string& type : string_histogram_samples_) {
+    type.clear();
+  }
 }
 
 void FakeMetricsObserver::IncrementEnumCounter(
     PeerConnectionEnumCounterType type,
     int counter,
     int counter_max) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   if (counters_.size() <= static_cast<size_t>(type)) {
     counters_.resize(type + 1);
   }
   auto& counters = counters_[type];
+  if (counters.size() < static_cast<size_t>(counter_max)) {
+    counters.resize(counter_max);
+  }
   ++counters[counter];
 }
 
 void FakeMetricsObserver::AddHistogramSample(PeerConnectionMetricsName type,
     int value) {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  RTC_DCHECK_EQ(histogram_samples_[type], 0);
-  histogram_samples_[type] = value;
+  RTC_DCHECK_EQ(int_histogram_samples_[type], 0);
+  int_histogram_samples_[type] = value;
+}
+
+void FakeMetricsObserver::AddHistogramSample(PeerConnectionMetricsName type,
+    const std::string& value) {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  string_histogram_samples_[type].assign(value);
 }
 
 int FakeMetricsObserver::GetEnumCounter(PeerConnectionEnumCounterType type,
                                         int counter) const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  RTC_CHECK(counters_.size() > static_cast<size_t>(type));
-  const auto& it = counters_[type].find(counter);
-  if (it == counters_[type].end()) {
-    return 0;
-  }
-  return it->second;
+  RTC_CHECK(counters_.size() > static_cast<size_t>(type) &&
+            counters_[type].size() > static_cast<size_t>(counter));
+  return counters_[type][counter];
 }
 
-int FakeMetricsObserver::GetHistogramSample(
+int FakeMetricsObserver::GetIntHistogramSample(
     PeerConnectionMetricsName type) const {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
-  return histogram_samples_[type];
+  return int_histogram_samples_[type];
+}
+
+const std::string& FakeMetricsObserver::GetStringHistogramSample(
+    PeerConnectionMetricsName type) const {
+  RTC_DCHECK(thread_checker_.CalledOnValidThread());
+  return string_histogram_samples_[type];
 }
 
 }  // namespace webrtc