Refactor the captive portal code to move from the ssl_blocking_page class to the ssl_error_classific

chrome/browser/ssl/ssl_error_classification_unittest.cc

Index: chrome/browser/ssl/ssl_error_classification_unittest.cc
diff --git a/chrome/browser/ssl/ssl_error_classification_unittest.cc b/chrome/browser/ssl/ssl_error_classification_unittest.cc
index fc4e23fc615da4cdc43ef2f237f4c90126c9d22e..fc8223e9359d7530bdcc194612506b45c405b076 100644
--- a/chrome/browser/ssl/ssl_error_classification_unittest.cc
+++ b/chrome/browser/ssl/ssl_error_classification_unittest.cc
@@ -6,6 +6,9 @@
 
 #include "base/files/file_path.h"
 #include "base/time/time.h"
+#include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "content/public/browser/web_contents.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
@@ -14,7 +17,15 @@
 
 using base::Time;
 
-TEST(SSLErrorClassification, TestDateInvalidScore) {
+class SSLErrorClassificationTest : public ChromeRenderViewHostTestHarness {
+ public:
+  virtual void SetUp() OVERRIDE {

[dcheng, 2014/07/22 21:38:20]

I patched your test in locally and ran it. Your test requires a MessageLoopForIO
backing the IO thread (the default TestThreadBundle option is to have one
message loop backing all the different threads), so you need to call
SetThreadBundleOptions(content::TestBrowserThreadBundle::REAL_IO_THREAD) in the
constructor for your test fixture. This way, you get a real MessageLoopForIO
backing the IO thread (rather than a MessageLoopForUI) and the CHECKs don't get
triggered.

+    ChromeRenderViewHostTestHarness::SetUp();
+    TabSpecificContentSettings::CreateForWebContents(web_contents());
+  }
+};
+
+TEST_F(SSLErrorClassificationTest, TestDateInvalidScore) {
   base::FilePath certs_dir = net::GetTestCertsDirectory();
   scoped_refptr<net::X509Certificate> expired_cert =
       net::ImportCertFromFile(certs_dir, "expired_cert.pem");
@@ -22,20 +33,19 @@ TEST(SSLErrorClassification, TestDateInvalidScore) {
 
   {
     EXPECT_TRUE(base::Time::FromString("Wed, 03 Jan 2007 12:00:00 GMT", &time));
-    SSLErrorClassification ssl_error(time, *expired_cert);
+    SSLErrorClassification ssl_error(web_contents(), time, *expired_cert);
     EXPECT_FLOAT_EQ(0.2f, ssl_error.CalculateScoreTimePassedSinceExpiry());
   }
 
   {
     EXPECT_TRUE(base::Time::FromString("Sat, 06 Jan 2007 12:00:00 GMT", &time));
-    SSLErrorClassification ssl_error(time, *expired_cert);
+    SSLErrorClassification ssl_error(web_contents(), time, *expired_cert);
     EXPECT_FLOAT_EQ(0.3f, ssl_error.CalculateScoreTimePassedSinceExpiry());
   }
 
   {
     EXPECT_TRUE(base::Time::FromString("Mon, 08 Jan 2007 12:00:00 GMT", &time));
-    SSLErrorClassification ssl_error(time, *expired_cert);
+    SSLErrorClassification ssl_error(web_contents(), time, *expired_cert);
     EXPECT_FLOAT_EQ(0.4f, ssl_error.CalculateScoreTimePassedSinceExpiry());
   }
-
 }