diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/histogram_synchronizer.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/histogram_synchronizer.cc')
| -rw-r--r-- | chromium/content/browser/histogram_synchronizer.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chromium/content/browser/histogram_synchronizer.cc b/chromium/content/browser/histogram_synchronizer.cc index 5a1e6f9a413..166172376cc 100644 --- a/chromium/content/browser/histogram_synchronizer.cc +++ b/chromium/content/browser/histogram_synchronizer.cc @@ -8,6 +8,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/metrics/histogram_delta_serialization.h" #include "base/pickle.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" @@ -268,16 +269,10 @@ void HistogramSynchronizer::OnHistogramDataCollected( const std::vector<std::string>& pickled_histograms) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - RequestContext* request = RequestContext::GetRequestContext(sequence_number); - - for (std::vector<std::string>::const_iterator it = pickled_histograms.begin(); - it < pickled_histograms.end(); - ++it) { - Pickle pickle(it->data(), it->size()); - PickleIterator iter(pickle); - base::DeserializeHistogramAndAddSamples(&iter); - } + base::HistogramDeltaSerialization::DeserializeAndAddSamples( + pickled_histograms); + RequestContext* request = RequestContext::GetRequestContext(sequence_number); if (!request) return; |