Navigation: move RestoreType and ReloadType into a separate file

components/favicon/content/content_favicon_driver.cc

 // Copyright 2015 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 "components/favicon/content/content_favicon_driver.h"
 
 #include "base/bind.h"
 #include "components/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_url.h"
@@ skipping 146 matching lines @@
   if (!entry)
     return;
 
   favicon_urls_ = candidates;
   OnUpdateFaviconURL(entry->GetURL(),
                      FaviconURLsFromContentFaviconURLs(candidates));
 }
 
 void ContentFaviconDriver::DidStartNavigationToPendingEntry(
     const GURL& url,
-    content::NavigationController::ReloadType reload_type) {
-  if (reload_type == content::NavigationController::NO_RELOAD ||
-      IsOffTheRecord())
+    content::ReloadType reload_type) {
+  if (reload_type == content::ReloadType::NONE || IsOffTheRecord())
     return;
 
   bypass_cache_page_url_ = url;
   SetFaviconOutOfDateForPage(
-      url,
-      reload_type == content::NavigationController::RELOAD_BYPASSING_CACHE);
+      url, reload_type == content::ReloadType::BYPASSING_CACHE);
 }
 
 void ContentFaviconDriver::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   favicon_urls_.clear();
 
   // Wait till the user navigates to a new URL to start checking the cache
   // again. The cache may be ignored for non-reload navigations (e.g.
   // history.replace() in-page navigation). This is allowed to increase the
   // likelihood that "reloading a page ignoring the cache" redownloads the
   // favicon. In particular, a page may do an in-page navigation before
   // FaviconHandler has the time to determine that the favicon needs to be
   // redownloaded.
   GURL url = details.entry->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url);
 }
 
 }  // namespace favicon