Persist server's crypto config data to disk cache for 0-RTT

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 "net/base/completion_callback.h"
@@ skipping 52 matching lines @@
 
 void DiskCacheBasedQuicServerInfo::Start() {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(GET_BACKEND, state_);
   DoLoop(OK);
 }
 
 int DiskCacheBasedQuicServerInfo::WaitForDataReady(
     const CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
-  DCHECK(state_ != GET_BACKEND);
+  DCHECK_NE(GET_BACKEND, state_);
 
   if (ready_)
     return OK;
 
   if (!callback.is_null()) {
-    DCHECK(user_callback_.is_null());
+    // Prevent a new callback for WaitForDataReady overwriting an existing
+    // pending callback(|user_callback_|).

[wtc, 2014/02/13 23:48:43]

Nit: add a space before the opening parenthesis '('.

[ramant (doing other things), 2014/02/15 00:36:12]

Done.

+    if (!user_callback_.is_null())
+      return ERR_INVALID_ARGUMENT;
     user_callback_ = callback;
   }
 
   return ERR_IO_PENDING;
 }
 
+bool DiskCacheBasedQuicServerInfo::IsDataReady() {
+  return ready_;
+}
+
 void DiskCacheBasedQuicServerInfo::Persist() {
   DCHECK(CalledOnValidThread());
-  DCHECK(state_ != GET_BACKEND);
+  DCHECK_NE(GET_BACKEND, state_);
 
   DCHECK(new_data_.empty());
   CHECK(ready_);
   DCHECK(user_callback_.is_null());
   new_data_ = Serialize();
 
   if (!backend_)
     return;
 
   state_ = CREATE_OR_OPEN;
   DoLoop(OK);
 }
 
 DiskCacheBasedQuicServerInfo::~DiskCacheBasedQuicServerInfo() {
   DCHECK(user_callback_.is_null());
   if (entry_)
     entry_->Close();
 }
 
 std::string DiskCacheBasedQuicServerInfo::key() const {
   return "quicserverinfo:" + hostname_;
 }
 
 void DiskCacheBasedQuicServerInfo::OnIOComplete(CacheOperationDataShim* unused,
                                                 int rv) {
+  DCHECK_NE(NONE, state_);
   rv = DoLoop(rv);
   if (rv != ERR_IO_PENDING && !user_callback_.is_null()) {
     CompletionCallback callback = user_callback_;
     user_callback_.Reset();
     callback.Run(rv);
   }
 }
 
 int DiskCacheBasedQuicServerInfo::DoLoop(int rv) {
   do {
@@ skipping 141 matching lines @@
     entry_->Close();
   entry_ = NULL;
   Parse(data_);
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoSetDone() {
   if (entry_)
     entry_->Close();
   entry_ = NULL;
+  new_data_.clear();
   state_ = NONE;
   return OK;
 }
 
 }  // namespace net