NavigationController: Reload methods migration

content/public/browser/navigation_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 332 matching lines @@
   virtual void GoBack() = 0;
   virtual void GoForward() = 0;
 
   // Navigates to the specified absolute index.
   virtual void GoToIndex(int index) = 0;
 
   // Navigates to the specified offset from the "current entry". Does nothing if
   // the offset is out of bounds.
   virtual void GoToOffset(int offset) = 0;
 
-  // Reloads the current entry under the specified ReloadType.
-  // TODO(toyoshim): Change all callers to use this new Reload(), and remove
-  // old Reload* methods below. One motivation of this change is Reload(bool)
-  // interface is just confusing because in some contexts, the bool could be to
-  // specify bypassing cache. http://crbug.com/670232
-  virtual void Reload(bool check_for_repost, ReloadType reload_type) = 0;
-
-  // Reloads the current entry. If |check_for_repost| is true and the current
-  // entry has POST data the user is prompted to see if they really want to
-  // reload the page. In nearly all cases pass in true.  If a transient entry
-  // is showing, initiates a new navigation to its URL.
-  virtual void Reload(bool check_for_repost) = 0;
-
-  // Like Reload(), but don't use caches (aka "shift-reload").
-  virtual void ReloadBypassingCache(bool check_for_repost) = 0;
-
-  // Reloads the current entry using the original URL used to create it.  This
-  // is used for cases where the user wants to refresh a page using a different
-  // user agent after following a redirect.
-  virtual void ReloadOriginalRequestURL(bool check_for_repost) = 0;
-
-  // Like Reload(), but disables Lo-Fi.
-  virtual void ReloadDisableLoFi(bool check_for_repost) = 0;
+  // Reloads the current entry under the specified ReloadType. If
+  // |check_for_repost| is true and the current entry has POST data the user is
+  // prompted to see if they really want to reload the page.  In nearly all
+  // cases pass in true.  If a transient entry is showing, initiates a new
+  // navigation to its URL.
+  virtual void Reload(bool check_for_repost,
+                      ReloadType reload_type = ReloadType::NORMAL) = 0;

[jam, 2016/12/09 17:38:40]

this is not allowed by the style guide:
https://google.github.io/styleguide/cppguide.html#Default_Arguments

[Takashi Toyoshima, 2016/12/13 11:20:32]

Oops. Thanks, I'd remove default type, and reorder arguments since I and creis@
discussed argument order in the previous review, and if default argument isn't a
good idea, ReloadType looks better to be the first argument.

 
   // Removing of entries -------------------------------------------------------
 
   // Removes the entry at the specified |index|.  If the index is the last
   // committed index or the pending entry, this does nothing and returns false.
   // Otherwise this call discards any transient or pending entries.
   virtual bool RemoveEntryAtIndex(int index) = 0;
 
   // Random --------------------------------------------------------------------
 
@@ skipping 84 matching lines @@
 
  private:
   // This interface should only be implemented inside content.
   friend class NavigationControllerImpl;
   NavigationController() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_