content::ReloadType cleanup: make NORMAL behave as MAIN_RESOURCE

content/browser/frame_host/navigation_controller_impl.cc

 // Copyright 2013 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
@@ skipping 247 matching lines @@
 
   // At this point, the |entries| is full of empty scoped_ptrs, so it can be
   // cleared out safely.
   entries->clear();
 
   // And finish the restore.
   FinishRestore(selected_navigation, type);
 }
 
 void NavigationControllerImpl::Reload(bool check_for_repost) {
-  ReloadInternal(check_for_repost, ReloadType::MAIN_RESOURCE);
+  ReloadInternal(check_for_repost, ReloadType::NORMAL);
 }
 void NavigationControllerImpl::ReloadBypassingCache(bool check_for_repost) {
   ReloadInternal(check_for_repost, ReloadType::BYPASSING_CACHE);
 }
 void NavigationControllerImpl::ReloadOriginalRequestURL(bool check_for_repost) {
   ReloadInternal(check_for_repost, ReloadType::ORIGINAL_REQUEST_URL);
 }
 void NavigationControllerImpl::ReloadDisableLoFi(bool check_for_repost) {
   ReloadInternal(check_for_repost, ReloadType::DISABLE_LOFI_MODE);
 }
@@ skipping 41 matching lines @@
   if (last_committed_reload_type_ != ReloadType::NONE) {
     DCHECK(!last_committed_reload_time_.is_null());
     base::Time now =
         time_smoother_.GetSmoothedTime(get_timestamp_callback_.Run());
     DCHECK_GT(now, last_committed_reload_time_);
     if (!last_committed_reload_time_.is_null() &&
         now > last_committed_reload_time_) {
       base::TimeDelta delta = now - last_committed_reload_time_;
       UMA_HISTOGRAM_MEDIUM_TIMES("Navigation.Reload.ReloadToReloadDuration",
                                  delta);
-      if (last_committed_reload_type_ == ReloadType::MAIN_RESOURCE) {
+      if (last_committed_reload_type_ == ReloadType::NORMAL) {
         UMA_HISTOGRAM_MEDIUM_TIMES(
             "Navigation.Reload.ReloadMainResourceToReloadDuration", delta);
       }
     }
   }
 
   // Set ReloadType for |entry| in order to check it at commit time.
   entry->set_reload_type(reload_type);
 
   if (g_check_for_repost && check_for_repost &&
@@ skipping 1736 matching lines @@
     }
   }
 }
 
 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
     const base::Callback<base::Time()>& get_timestamp_callback) {
   get_timestamp_callback_ = get_timestamp_callback;
 }
 
 }  // namespace content