SSL Host info: Make sure that we can update certificate chains in

net/http/mock_http_cache.cc

 // Copyright (c) 2011 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/mock_http_cache.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 323 matching lines @@
   }
 
  private:
   net::OldCompletionCallback* callback_;
   int result_;
   DISALLOW_COPY_AND_ASSIGN(CallbackRunner);
 };
 
 MockDiskCache::MockDiskCache()
     : open_count_(0), create_count_(0), fail_requests_(false),
-      soft_failures_(false) {
+      soft_failures_(false), double_create_check_(true) {
 }
 
 MockDiskCache::~MockDiskCache() {
   ReleaseAll();
 }
 
 int32 MockDiskCache::GetEntryCount() const {
   return static_cast<int32>(entries_.size());
 }
 
@@ skipping 30 matching lines @@
 
 int MockDiskCache::CreateEntry(const std::string& key,
                                disk_cache::Entry** entry,
                                net::OldCompletionCallback* callback) {
   DCHECK(callback);
   if (fail_requests_)
     return net::ERR_CACHE_CREATE_FAILURE;
 
   EntryMap::iterator it = entries_.find(key);
   if (it != entries_.end()) {
-    DCHECK(it->second->is_doomed());
+    if (!it->second->is_doomed()) {
+      if (double_create_check_)
+        NOTREACHED();
+      else
+        return net::ERR_CACHE_CREATE_FAILURE;

[wtc, 2011/11/30 00:22:09]

Nit: add curly braces?

[rvargas (doing something else), 2011/11/30 01:05:24]

Sorry, I missed this comment. Before I change it, do you mention it for the
NOTREACHED or for the else? I ask because I consistently don't add braces for
the else, but I'm ambivalent on macros.

[wtc, 2011/11/30 01:36:40]

You can ignore this change request.

When I first started working on Chrome, Darin always made
me add curly braces to any if statements that have an "else",
even if the bodies are one-liners.

So I am just trying to follow Darin's style.  It is not
because NOTREACHED() is a macro.

+    }
     it->second->Release();
     entries_.erase(it);
   }
 
   create_count_++;
 
   MockDiskEntry* new_entry = new MockDiskEntry(key);
 
   new_entry->AddRef();
   entries_[key] = new_entry;
@@ skipping 198 matching lines @@
 void MockBlockingBackendFactory::FinishCreation() {
   block_ = false;
   if (callback_) {
     if (!fail_)
       *backend_ = new MockDiskCache();
     net::OldCompletionCallback* cb = callback_;
     callback_ = NULL;
     cb->Run(Result());  // This object can be deleted here.
   }
 }