Navigation: move RestoreType and ReloadType into a separate file

android_webview/browser/icon_helper.h

 // Copyright (c) 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_
 #define ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "content/public/browser/web_contents_observer.h"

[Charlie Reis, 2016/09/09 05:41:05]

nit: Include-what-you-use.  Many of these files outside content/ should be
including restore_type.h or reload_type.h.

[Takashi Toyoshima, 2016/09/09 07:31:30]

Done.

 #include "url/gurl.h"
 
 class SkBitmap;
 
 namespace content {
 struct FaviconURL;
 }
 
 namespace gfx {
 class Size;
@@ skipping 18 matching lines @@
   explicit IconHelper(content::WebContents* web_contents);
   ~IconHelper() override;
 
   void SetListener(Listener* listener);
 
   // From WebContentsObserver
   void DidUpdateFaviconURL(
       const std::vector<content::FaviconURL>& candidates) override;
   void DidStartNavigationToPendingEntry(
       const GURL& url,
-      content::NavigationController::ReloadType reload_type) override;
+      content::ReloadType reload_type) override;
 
   void DownloadFaviconCallback(
       int id,
       int http_status_code,
       const GURL& image_url,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
  private:
   void MarkUnableToDownloadFavicon(const GURL& icon_url);
   bool WasUnableToDownloadFavicon(const GURL& icon_url) const;
   void ClearUnableToDownloadFavicons();
 
   Listener* listener_;
 
   typedef uint32_t MissingFaviconURLHash;
   base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
 
   DISALLOW_COPY_AND_ASSIGN(IconHelper);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_ICON_HELPER_H_