diff options
Diffstat (limited to 'content/browser/tab_contents')
4 files changed, 8 insertions, 14 deletions
diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h index 40bc8a8..2ed55b8 100644 --- a/content/browser/tab_contents/navigation_entry.h +++ b/content/browser/tab_contents/navigation_entry.h @@ -15,7 +15,6 @@ #include "content/common/page_type.h" #include "content/common/security_style.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" #include "third_party/skia/include/core/SkBitmap.h" class SiteInstance; @@ -76,10 +75,10 @@ class CONTENT_EXPORT NavigationEntry { return cert_id_; } - void set_cert_status(net::CertStatus ssl_cert_status) { + void set_cert_status(int ssl_cert_status) { cert_status_ = ssl_cert_status; } - net::CertStatus cert_status() const { + int cert_status() const { return cert_status_; } @@ -126,7 +125,7 @@ class CONTENT_EXPORT NavigationEntry { // See the accessors above for descriptions. SecurityStyle security_style_; int cert_id_; - net::CertStatus cert_status_; + int cert_status_; int security_bits_; int connection_status_; int content_status_; diff --git a/content/browser/tab_contents/navigation_entry_unittest.cc b/content/browser/tab_contents/navigation_entry_unittest.cc index a7b5ff9..ee7d083 100644 --- a/content/browser/tab_contents/navigation_entry_unittest.cc +++ b/content/browser/tab_contents/navigation_entry_unittest.cc @@ -113,14 +113,13 @@ TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) { // Change from the defaults entry2_.get()->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATED); entry2_.get()->ssl().set_cert_id(4); - entry2_.get()->ssl().set_cert_status(net::CERT_STATUS_COMMON_NAME_INVALID); + entry2_.get()->ssl().set_cert_status(1); entry2_.get()->ssl().set_security_bits(0); entry2_.get()->ssl().set_displayed_insecure_content(); EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry2_.get()->ssl().security_style()); EXPECT_EQ(4, entry2_.get()->ssl().cert_id()); - EXPECT_EQ(net::CERT_STATUS_COMMON_NAME_INVALID, - entry2_.get()->ssl().cert_status()); + EXPECT_EQ(1, entry2_.get()->ssl().cert_status()); EXPECT_EQ(0, entry2_.get()->ssl().security_bits()); EXPECT_TRUE(entry2_.get()->ssl().displayed_insecure_content()); diff --git a/content/browser/tab_contents/provisional_load_details.h b/content/browser/tab_contents/provisional_load_details.h index 87d6569..0e8331f 100644 --- a/content/browser/tab_contents/provisional_load_details.h +++ b/content/browser/tab_contents/provisional_load_details.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" -#include "net/base/cert_status_flags.h" // This class captures some of the information associated to the provisional // load of a frame. It is provided as Details with the @@ -49,7 +48,7 @@ class ProvisionalLoadDetails { int ssl_cert_id() const { return ssl_cert_id_; } - net::CertStatus ssl_cert_status() const { return ssl_cert_status_; } + int ssl_cert_status() const { return ssl_cert_status_; } int ssl_security_bits() const { return ssl_security_bits_; } @@ -66,7 +65,7 @@ class ProvisionalLoadDetails { bool is_main_frame_; bool is_in_page_navigation_; int ssl_cert_id_; - net::CertStatus ssl_cert_status_; + int ssl_cert_status_; int ssl_security_bits_; int ssl_connection_status_; bool is_error_page_; diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 9e80c93..287e661 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -1030,10 +1030,7 @@ void TabContents::OnDidLoadResourceFromMemoryCache( cache.Increment(); // Send out a notification that we loaded a resource from our memory cache. - int cert_id = 0; - net::CertStatus cert_status = 0; - int security_bits = -1; - int connection_status = 0; + int cert_id = 0, cert_status = 0, security_bits = -1, connection_status = 0; SSLManager::DeserializeSecurityInfo(security_info, &cert_id, &cert_status, &security_bits, |