Disable Name Mismatch redirection for non-overridable SSL errors

chrome/browser/ssl/ssl_error_handler_unittest.cc

Index: chrome/browser/ssl/ssl_error_handler_unittest.cc
diff --git a/chrome/browser/ssl/ssl_error_handler_unittest.cc b/chrome/browser/ssl/ssl_error_handler_unittest.cc
index f812d6b1e4806f0a637eb678883babd2739c56ac..5dd5b88164b51e835e82df17d179da472184eb60 100644
--- a/chrome/browser/ssl/ssl_error_handler_unittest.cc
+++ b/chrome/browser/ssl/ssl_error_handler_unittest.cc
@@ -42,7 +42,8 @@ class TestSSLErrorHandler : public SSLErrorHandler {
         suggested_url_checked_(false),
         ssl_interstitial_shown_(false),
         captive_portal_interstitial_shown_(false),
-        common_name_mismatch_redirect_(false) {}
+        common_name_mismatch_redirect_(false),
+        is_overridable_(true) {}
 
   ~TestSSLErrorHandler() override {
   }
@@ -100,6 +101,8 @@ class TestSSLErrorHandler : public SSLErrorHandler {
     return common_name_mismatch_redirect_;
   }
 
+  void SetOverridable(bool is_overridable) { is_overridable_ = is_overridable; }

[meacer, 2015/08/20 23:15:22]

lower case for simple setters (set_overridable_error). Actually, name this
set_non_overridable_error() since is_overridable param is never used as |true|.

[Bhanu Dev, 2015/08/21 00:52:16]

Done.

+
   void Reset() {
     captive_portal_checked_ = false;
     suggested_url_exists_ = false;
@@ -107,6 +110,7 @@ class TestSSLErrorHandler : public SSLErrorHandler {
     ssl_interstitial_shown_ = false;
     captive_portal_interstitial_shown_ = false;
     common_name_mismatch_redirect_ = false;
+    is_overridable_ = true;

[meacer, 2015/08/20 23:15:22]

This method should only clear the counters. Each test case should create a new
error_handler() so you shouldn't need to set |is_overridable_| to true here.

[Bhanu Dev, 2015/08/21 00:52:16]

Done.

   }
 
  private:
@@ -128,6 +132,8 @@ class TestSSLErrorHandler : public SSLErrorHandler {
     common_name_mismatch_redirect_ = true;
   }
 
+  bool IsOverridable() override { return is_overridable_; }
+
   Profile* profile_;
   bool captive_portal_checked_;
   bool suggested_url_exists_;
@@ -135,6 +141,7 @@ class TestSSLErrorHandler : public SSLErrorHandler {
   bool ssl_interstitial_shown_;
   bool captive_portal_interstitial_shown_;
   bool common_name_mismatch_redirect_;
+  bool is_overridable_;

[meacer, 2015/08/20 23:15:22]

nit: Rename to is_overridable_error_

[Bhanu Dev, 2015/08/21 00:52:16]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(TestSSLErrorHandler);
 };
@@ -268,6 +275,20 @@ TEST_F(SSLErrorHandlerTest, ShouldNotCheckCaptivePortalIfSuggestedUrlExists) {
   EXPECT_TRUE(error_handler()->ssl_interstitial_shown());
 }
 
+TEST_F(SSLErrorHandlerTest, ShouldNotCheckSuggestedUrlOnNonOverridableError) {

[meacer, 2015/08/20 23:15:22]

nit: Change the test name to ShouldNotHandleNameMismatchOnNonOverridableError.

[Bhanu Dev, 2015/08/21 00:52:16]

Done.

+  error_handler()->SetSuggestedUrlExists(true);
+  error_handler()->SetOverridable(false);
+  error_handler()->StartHandlingError();
+
+  EXPECT_FALSE(error_handler()->suggested_url_checked());
+  EXPECT_TRUE(error_handler()->captive_portal_checked());
+  EXPECT_TRUE(error_handler()->IsTimerRunning());
+  base::RunLoop().RunUntilIdle();
+
+  EXPECT_FALSE(error_handler()->IsTimerRunning());
+  EXPECT_TRUE(error_handler()->ssl_interstitial_shown());
+}
+
 #else  // #if !defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 
 TEST_F(SSLErrorHandlerTest,