Do not reset NavigationHandle when navigating same-page

chrome/browser/ssl/chrome_security_state_model_client_unittest.cc

 // Copyright 2016 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 "chrome/browser/ssl/chrome_security_state_model_client.h"
 
 #include "base/command_line.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "components/security_state/security_state_model.h"
@@ skipping 255 matching lines @@
  protected:
   ChromeSecurityStateModelClient* client() { return client_; }
 
   void signal_password() {
     web_contents()->OnPasswordInputShownOnHttp();
     client_->VisibleSecurityStateChanged();
   }
 
   void navigate_to_http() { NavigateAndCommit(GURL("http://example.test")); }
 
+  void navigate_to_different_http_page() {
+    NavigateAndCommit(GURL("http://example2.test"));
+  }
+
  private:
   ChromeSecurityStateModelClient* client_;
   DISALLOW_COPY_AND_ASSIGN(ChromeSecurityStateModelClientHistogramTest);
 };
 
 // Tests that UMA logs the omnibox warning when security level is
 // HTTP_SHOW_WARNING.
 TEST_F(ChromeSecurityStateModelClientHistogramTest,
        HTTPOmniboxWarningHistogram) {
   // Show Warning Chip.
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       security_state::switches::kMarkHttpAs,
       security_state::switches::kMarkHttpWithPasswordsOrCcWithChip);
 
   base::HistogramTester histograms;
   signal_password();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 1);
 
   // Fire again and ensure no sample is recorded.
   signal_password();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 1);
 
   // Navigate to a new page and ensure a sample is recorded.
-  navigate_to_http();
+  navigate_to_different_http_page();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 1);
   signal_password();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, true, 2);
 }
 
 // Tests that UMA logs the console warning when security level is NONE.
 TEST_F(ChromeSecurityStateModelClientHistogramTest,
        HTTPConsoleWarningHistogram) {
   // Show Neutral for HTTP
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       security_state::switches::kMarkHttpAs,
       security_state::switches::kMarkHttpAsNeutral);
 
   base::HistogramTester histograms;
   signal_password();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 1);
 
   // Fire again and ensure no sample is recorded.
   signal_password();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 1);
 
   // Navigate to a new page and ensure a sample is recorded.
-  navigate_to_http();
+  navigate_to_different_http_page();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 1);
   signal_password();
   histograms.ExpectUniqueSample(kHTTPBadHistogram, false, 2);
 }
 
 }  // namespace