Use the Native Certificate Viewer on MacOS even on MacViews

BUG=766926

Change-Id: I6d0302763687bbb4fe30682684ad85a2ac79f782
Reviewed-on: https://chromium-review.googlesource.com/1145674Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577201}

chrome/browser/ui/views/ssl_client_certificate_selector.cc

@@ -142,14 +142,11 @@ void ShowSSLClientCertificateSelector(
     net::ClientCertIdentityList client_certs,
     std::unique_ptr<content::ClientCertificateDelegate> delegate) {
 #if defined(OS_MACOSX)
-  // TODO(ellyjones): Always use the Cocoa cert selector, even in Views builds.
-  // See also https://crbug.com/804950.
-  if (views_mode_controller::IsViewsBrowserCocoa()) {
-    return ShowSSLClientCertificateSelectorCocoa(contents, cert_request_info,
-                                                 std::move(client_certs),
-                                                 std::move(delegate));
-  }
-#endif
+  return ShowSSLClientCertificateSelectorCocoa(contents, cert_request_info,
+                                               std::move(client_certs),
+                                               std::move(delegate));
+#else   // defined(OS_MACOSX)
+
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Not all WebContentses can show modal dialogs.
@@ -164,6 +161,7 @@ void ShowSSLClientCertificateSelector(
       std::move(delegate));
   selector->Init();
   selector->Show();
+#endif  // defined(OS_MACOSX)
 }
 
 }  // namespace chrome