Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

net/http/disk_cache_based_quic_server_info.cc

 // Copyright 2014 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 "net/http/disk_cache_based_quic_server_info.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 60 matching lines @@
       weak_factory_(this) {
       io_callback_ =
           base::Bind(&DiskCacheBasedQuicServerInfo::OnIOComplete,
                      weak_factory_.GetWeakPtr(),
                      base::Owned(data_shim_));  // Ownership assigned.
 }
 
 void DiskCacheBasedQuicServerInfo::Start() {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(GET_BACKEND, state_);
+  load_start_time_ = base::TimeTicks::Now();
   DoLoop(OK);
 }
 
 int DiskCacheBasedQuicServerInfo::WaitForDataReady(
     const CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK_NE(GET_BACKEND, state_);
 
   if (ready_)
     return OK;
@@ skipping 214 matching lines @@
   state_ = NONE;
   ready_ = true;
   // We close the entry because, if we shutdown before ::Persist is called,
   // then we might leak a cache reference, which causes a DCHECK on shutdown.
   if (entry_) {
     entry_->Close();
     RecordDiskCacheEntryState(DISK_CACHE_ENTRY_CLOSED);
   }
   entry_ = NULL;
   Parse(data_);
+  UMA_HISTOGRAM_TIMES("Net.QuicServerInfo.DiskCacheLoadTime",
+                      base::TimeTicks::Now() - load_start_time_);
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoSetDone() {
   if (entry_) {
     entry_->Close();
     RecordDiskCacheEntryState(DISK_CACHE_ENTRY_CLOSED);
   }
   entry_ = NULL;
   new_data_.clear();
   state_ = NONE;
   return OK;
 }
 
 }  // namespace net