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..0421a737568feaf8f2bc8768284caa7fca51351f 100644
--- a/chrome/browser/ssl/ssl_error_classification_unittest.cc
+++ b/chrome/browser/ssl/ssl_error_classification_unittest.cc
@@ -6,6 +6,8 @@
 
 #include "base/files/file_path.h"
 #include "base/time/time.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"
@@ -13,29 +15,54 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
+using content::WebContents;
 
-TEST(SSLErrorClassification, TestDateInvalidScore) {
+class SSLErrorClassificationTest : public ChromeRenderViewHostTestHarness {
+ public:
+  SSLErrorClassificationTest() {
+    SetThreadBundleOptions(content::TestBrowserThreadBundle::REAL_IO_THREAD);
+  }
+
+  virtual void SetUp() OVERRIDE {
+    ChromeRenderViewHostTestHarness::SetUp();
+    web_contents_.reset(CreateTestWebContents());

[dcheng, 2014/07/24 00:46:40]

CRVHTH::SetUp() already creates a web contents. Do you need a second one or can
you just the default one?

[radhikabhar, 2014/07/24 00:52:46]

Done.

+  }
+
+  virtual void TearDown() OVERRIDE {
+    web_contents_.reset(NULL);
+    ChromeRenderViewHostTestHarness::TearDown();
+  }
+
+  WebContents* GetWebContents() {
+    return web_contents_.get();
+  }
+
+ private:
+  scoped_ptr<WebContents> 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");
   base::Time time;
+  WebContents* contents = GetWebContents();
 
   {
     EXPECT_TRUE(base::Time::FromString("Wed, 03 Jan 2007 12:00:00 GMT", &time));
-    SSLErrorClassification ssl_error(time, *expired_cert);
+    SSLErrorClassification ssl_error(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(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(contents, time, *expired_cert);
     EXPECT_FLOAT_EQ(0.4f, ssl_error.CalculateScoreTimePassedSinceExpiry());
   }
-
 }