Update SSL error handling code to account for Subject CN deprecation

chrome/browser/ssl/ssl_error_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
 #define CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 48 matching lines @@
 class SSLErrorHandler : public content::WebContentsUserData<SSLErrorHandler>,
                         public content::WebContentsObserver,
                         public content::NotificationObserver {
  public:
   typedef base::Callback<void(content::WebContents*)> TimerStartedCallback;
 
   // Events for UMA. Do not rename or remove values, add new values to the end.
   // Public for testing.
   enum UMAEvent {
     HANDLE_ALL = 0,
     SHOW_CAPTIVE_PORTAL_INTERSTITIAL_NONOVERRIDABLE,

[Mark P, 2017/04/05 18:18:25]

optional nit: prefer labeling = 1, ... as recommended here
https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histo...

[elawrence, 2017/04/05 23:05:16]

Done.

     SHOW_CAPTIVE_PORTAL_INTERSTITIAL_OVERRIDABLE,
     SHOW_SSL_INTERSTITIAL_NONOVERRIDABLE,
     SHOW_SSL_INTERSTITIAL_OVERRIDABLE,
-    WWW_MISMATCH_FOUND,
+    WWW_MISMATCH_FOUND,  // Deprecated by WWW_MISMATCH_FOUND_IN_SAN
     WWW_MISMATCH_URL_AVAILABLE,
     WWW_MISMATCH_URL_NOT_AVAILABLE,
     SHOW_BAD_CLOCK,
     CAPTIVE_PORTAL_CERT_FOUND,
+    WWW_MISMATCH_FOUND_IN_SAN,
     SSL_ERROR_HANDLER_EVENT_COUNT
   };
 
   // This delegate allows unit tests to provide their own Chrome specific
   // actions.
   class Delegate {
    public:
     virtual ~Delegate() {}
     virtual void CheckForCaptivePortal() = 0;
     virtual bool GetSuggestedUrl(const std::vector<std::string>& dns_names,
@@ skipping 105 matching lines @@
   base::OneShotTimer timer_;
 
   std::unique_ptr<CommonNameMismatchHandler> common_name_mismatch_handler_;
 
   base::WeakPtrFactory<SSLErrorHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLErrorHandler);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_ERROR_HANDLER_H_