content::ReloadType cleanup: make NORMAL behave as MAIN_RESOURCE

content/browser/frame_host/navigation_controller_impl_browsertest.cc

 // Copyright 2014 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 "content/browser/frame_host/navigation_controller_impl.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
@@ skipping 6672 matching lines @@
   // Navigate to a page, and check if metrics are initialized correctly.
   EXPECT_TRUE(NavigateToURL(
       shell(), embedded_test_server()->GetURL(
                    "/navigation_controller/page_with_links.html")));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 0);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 0);
 
   NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
       shell()->web_contents()->GetController());
 
-  // Reload triggers a reload of ReloadType::MAIN_RESOURCE.  The first reload
-  // should not be counted.
+  // Reload triggers a reload of ReloadType::NORMAL.  The first reload should
+  // not be counted.
   controller.Reload(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 0);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 0);
 
   // ReloadBypassingCache triggers a reload of ReloadType::BYPASSING_CACHE.
   // Both metrics should count the consecutive reloads.
   controller.ReloadBypassingCache(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 1);
@@ skipping 14 matching lines @@
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 2);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 1);
 
   // Then, the next reload should be assumed as the first reload.  Metrics
   // should not be changed for the first reload.
   controller.Reload(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 2);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 1);
 
-  // Another reload of ReloadType::MAIN_RESOURCE should be counted by both
-  // metrics again.
+  // Another reload of ReloadType::NORMAL should be counted by both metrics
+  // again.
   controller.Reload(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 3);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 2);
 
   // A renderer-initiated navigations with no user gesture don't reset reload
   // tracking information, and the following reload will be counted by metrics.
   ExecuteJavaScriptAndWaitForLoadStop(
       shell()->web_contents(),
       "history.pushState({}, 'page 1', 'simple_page_1.html')");
@@ skipping 281 matching lines @@
   NavigationHandleCommitObserver handle_observer(shell()->web_contents(),
                                                  kFragmentURL);
   EXPECT_TRUE(NavigateToURL(shell(), kFragmentURL));
 
   EXPECT_TRUE(handle_observer.has_committed());
   EXPECT_TRUE(handle_observer.was_same_page());
   EXPECT_FALSE(handle_observer.was_renderer_initiated());
 }
 
 }  // namespace content