Land Recent QUIC Changes.

net/quic/crypto/common_cert_set.cc

 // Copyright (c) 2013 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/quic/crypto/common_cert_set.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "net/quic/quic_utils.h"
@@ skipping 122 matching lines @@
 
     return false;
   }
 
   static CommonCertSetsQUIC* GetInstance() {
     return Singleton<CommonCertSetsQUIC>::get();
   }
 
  private:
   CommonCertSetsQUIC() {}
-  virtual ~CommonCertSetsQUIC() {}
+  virtual ~CommonCertSetsQUIC() OVERRIDE {}
 
   friend struct DefaultSingletonTraits<CommonCertSetsQUIC>;
   DISALLOW_COPY_AND_ASSIGN(CommonCertSetsQUIC);
 };
 
 }  // anonymous namespace
 
 CommonCertSets::~CommonCertSets() {}
 
 // static
 const CommonCertSets* CommonCertSets::GetInstanceQUIC() {
   return CommonCertSetsQUIC::GetInstance();
 }
 
 }  // namespace net