Restore user state on ReloadwithoutSubResourceCacheRevalidation

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 3cdf16253289e47b10e578a534d6adf17aacb37b..90bda829a90afa55bffa16a6184957bfe651ffe0 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -122,11 +122,10 @@ bool isReloadLoadType(FrameLoadType type)
 
 static bool needsHistoryItemRestore(FrameLoadType type)
 {
-    // TODO(toyoshim): Check if this should return true for
-    // FrameLoadTypeReloadMainResource.
-    return type == FrameLoadTypeBackForward
-        || type == FrameLoadTypeReload
-        || type == FrameLoadTypeReloadBypassingCache;
+    if (!RuntimeEnabledFeatures::reloadwithoutSubResourceCacheRevalidationEnabled() && type == FrameLoadTypeReloadMainResource)
+        return false;
+    // TODO(toyoshim): Shall we return true for FrameLoadTypeInitialHistoryLoad too?
+    return type == FrameLoadTypeBackForward || isReloadLoadType(type);
 }
 
 // static