Minor clean-up tasks that were TODO(snej)

chrome/browser/ssl/ssl_policy.cc

 // Copyright (c) 2010 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 "chrome/browser/ssl/ssl_policy.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 24 matching lines @@
 #include "net/base/ssl_info.h"
 #include "webkit/glue/resource_type.h"
 
 SSLPolicy::SSLPolicy(SSLPolicyBackend* backend)
     : backend_(backend) {
   DCHECK(backend_);
 }
 
 void SSLPolicy::OnCertError(SSLCertErrorHandler* handler) {
   // First we check if we know the policy for this error.
-  net::X509Certificate::Policy::Judgment judgment =
+  net::CertPolicy::Judgment judgment =
       backend_->QueryPolicy(handler->ssl_info().cert,
                             handler->request_url().host());
 
-  if (judgment == net::X509Certificate::Policy::ALLOWED) {
+  if (judgment == net::CertPolicy::ALLOWED) {
     handler->ContinueRequest();
     return;
   }
 
   // The judgment is either DENIED or UNKNOWN.
   // For now we handle the DENIED as the UNKNOWN, which means a blocking
   // page is shown to the user every time he comes back to the page.
 
   switch (handler->cert_error()) {
     case net::ERR_CERT_COMMON_NAME_INVALID:
@@ skipping 178 matching lines @@
 
   entry->ssl().set_security_style(entry->url().SchemeIsSecure() ?
       SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED);
 }
 
 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) {
   GURL parsed_origin(origin);
   if (parsed_origin.SchemeIsSecure())
     backend_->HostRanInsecureContent(parsed_origin.host(), pid);
 }