Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / ocsp / nss_ocsp_unittest.cc

diff --git a/src/net/ocsp/nss_ocsp_unittest.cc b/src/net/ocsp/nss_ocsp_unittest.cc
index 0201ad1..745741e 100644 (file)
--- a/src/net/ocsp/nss_ocsp_unittest.cc
+++ b/src/net/ocsp/nss_ocsp_unittest.cc
@@ -44,12 +44,12 @@ class AiaResponseHandler : public net::URLRequestInterceptor {
  public:
   AiaResponseHandler(const std::string& headers, const std::string& cert_data)
       : headers_(headers), cert_data_(cert_data), request_count_(0) {}
-  virtual ~AiaResponseHandler() {}
+  ~AiaResponseHandler() override {}
 
   // net::URLRequestInterceptor implementation:
-  virtual net::URLRequestJob* MaybeInterceptRequest(
+  net::URLRequestJob* MaybeInterceptRequest(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     ++const_cast<AiaResponseHandler*>(this)->request_count_;
 
     return new net::URLRequestTestJob(
@@ -75,9 +75,9 @@ class NssHttpTest : public ::testing::Test {
         handler_(NULL),
         verify_proc_(new CertVerifyProcNSS),
         verifier_(new MultiThreadedCertVerifier(verify_proc_.get())) {}
-  virtual ~NssHttpTest() {}
+  ~NssHttpTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     std::string file_contents;
     ASSERT_TRUE(base::ReadFileToString(
         GetTestCertsDirectory().AppendASCII("aia-intermediate.der"),
@@ -91,15 +91,13 @@ class NssHttpTest : public ::testing::Test {
     handler_ = handler.get();
 
     URLRequestFilter::GetInstance()->AddHostnameInterceptor(
-        "http",
-        kAiaHost,
-        handler.PassAs<URLRequestInterceptor>());
+        "http", kAiaHost, handler.Pass());
 
     SetURLRequestContextForNSSHttpIO(&context_);
     EnsureNSSHttpIOInit();
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     ShutdownNSSHttpIO();
 
     if (handler_)