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

content/browser/tab_contents/navigation_entry_unittest.cc

 // 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.
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 95 matching lines @@
   EXPECT_EQ(SECURITY_STYLE_UNKNOWN, entry2_.get()->ssl().security_style());
   EXPECT_EQ(0, entry1_.get()->ssl().cert_id());
   EXPECT_EQ(0, entry1_.get()->ssl().cert_status());
   EXPECT_EQ(-1, entry1_.get()->ssl().security_bits());
   EXPECT_FALSE(entry1_.get()->ssl().displayed_insecure_content());
   EXPECT_FALSE(entry1_.get()->ssl().ran_insecure_content());
 
   // 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());
 
   entry2_.get()->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN);
   entry2_.get()->ssl().set_ran_insecure_content();
   EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN,
             entry2_.get()->ssl().security_style());
   EXPECT_TRUE(entry2_.get()->ssl().ran_insecure_content());
 }
 
@@ skipping 46 matching lines @@
   EXPECT_FALSE(entry2_.get()->has_post_data());
   entry2_.get()->set_has_post_data(true);
   EXPECT_TRUE(entry2_.get()->has_post_data());
 
   // Restored
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type());
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type());
   entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION);
   EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type());
 }