Update from chromium https://crrev.com/301725/

net/base/keygen_handler_unittest.cc

Index: net/base/keygen_handler_unittest.cc
diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc
index af4e01d99440e03f3f3b3c7e00e6374a9b2c16d6..2357328e42c16fc15445f8d3ab7abd98fb97cd63 100644
--- a/net/base/keygen_handler_unittest.cc
+++ b/net/base/keygen_handler_unittest.cc
@@ -32,13 +32,13 @@ class StubCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
    explicit StubCryptoModuleDelegate(crypto::ScopedPK11Slot slot)
        : slot_(slot.Pass()) {}
 
-   virtual std::string RequestPassword(const std::string& slot_name,
-                                       bool retry,
-                                       bool* cancelled) override{
+   std::string RequestPassword(const std::string& slot_name,
+                               bool retry,
+                               bool* cancelled) override {
      return std::string();
    }
 
-   virtual crypto::ScopedPK11Slot RequestSlot() override {
+   crypto::ScopedPK11Slot RequestSlot() override {
      return crypto::ScopedPK11Slot(PK11_ReferenceSlot(slot_.get()));
    }
 
@@ -50,7 +50,7 @@ class StubCryptoModuleDelegate : public crypto::NSSCryptoModuleDelegate {
 class KeygenHandlerTest : public ::testing::Test {
  public:
   KeygenHandlerTest() {}
-  virtual ~KeygenHandlerTest() {}
+  ~KeygenHandlerTest() override {}
 
   scoped_ptr<KeygenHandler> CreateKeygenHandler() {
     scoped_ptr<KeygenHandler> handler(new KeygenHandler(