Revert 102322 - For the SSL cert status, convert anonymous enum that gives bit values into a type...

content/browser/ssl/ssl_manager.h

 // Copyright (c) 2011 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 CONTENT_BROWSER_SSL_SSL_MANAGER_H_
 #define CONTENT_BROWSER_SSL_SSL_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/ssl/ssl_policy_backend.h"
 #include "content/common/content_export.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/cert_status_flags.h"
 #include "net/base/net_errors.h"
 
 class LoadFromMemoryCacheDetails;
 class NavigationController;
 class NavigationEntry;
 class ProvisionalLoadDetails;
 class ResourceDispatcherHost;
 class ResourceRedirectDetails;
 class ResourceRequestDetails;
 class SSLPolicy;
@@ skipping 22 matching lines @@
                                     net::URLRequest* request,
                                     int cert_error,
                                     net::X509Certificate* cert);
 
   // Called when SSL state for a host or tab changes.  Broadcasts the
   // SSL_INTERNAL_STATE_CHANGED notification.
   static void NotifySSLInternalStateChanged(NavigationController* controller);
 
   // Convenience methods for serializing/deserializing the security info.
   static std::string SerializeSecurityInfo(int cert_id,
-                                           net::CertStatus cert_status,
+                                           int cert_status,
                                            int security_bits,
                                            int connection_status);
-  CONTENT_EXPORT static bool DeserializeSecurityInfo(
-      const std::string& state,
-      int* cert_id,
-      net::CertStatus* cert_status,
-      int* security_bits,
-      int* connection_status);
+  CONTENT_EXPORT static bool DeserializeSecurityInfo(const std::string& state,
+                                                     int* cert_id,
+                                                     int* cert_status,
+                                                     int* security_bits,
+                                                     int* connection_status);
 
   // Construct an SSLManager for the specified tab.
   // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
   explicit SSLManager(NavigationController* controller);
   virtual ~SSLManager();
 
   SSLPolicy* policy() { return policy_.get(); }
   SSLPolicyBackend* backend() { return &backend_; }
 
   // The navigation controller associated with this SSLManager.  The
@@ skipping 42 matching lines @@
   // for the security UI of this tab.
   NavigationController* controller_;
 
   // Handles registering notifications with the NotificationService.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLManager);
 };
 
 #endif  // CONTENT_BROWSER_SSL_SSL_MANAGER_H_