Reload: FrameMsg_Navigate_Type cleanup to rename RELOAD_MAIN_RESOURCE

To use FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE consistently
instead of FrameMsg_Navigate_Type::RELOAD in content, rename
RELOAD_MAIN_RESOURCE to RELOAD and override old behavior.

This change introduces two functional changes:

 1. RELOAD_ORIGINAL_REQUEST_URL is changed to revalidate
    only main resource instead of revalidating all.
    (in render_frame_impl.cc ReloadFrameLoadTypeFor)

 2. In LoadDataURL(), replace flag is set for usual reload
    operations. This was the original behavior, but unexpectedly
    changed in newly introduced ReloadMainResource cases.

BUG=670232
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation

Review-Url: https://codereview.chromium.org/2583123002
Cr-Commit-Position: refs/heads/master@{#443518}

content/browser/frame_host/navigation_request.cc

@@ -59,7 +59,6 @@ void UpdateLoadFlagsWithCacheFlags(
     bool is_post) {
   switch (navigation_type) {
     case FrameMsg_Navigate_Type::RELOAD:
-    case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
     case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
       *load_flags |= net::LOAD_VALIDATE_CACHE;
       break;
@@ -147,7 +146,6 @@ void AddAdditionalRequestHeaders(net::HttpRequestHeaders* headers,
 
   bool is_reload =
       navigation_type == FrameMsg_Navigate_Type::RELOAD ||
-      navigation_type == FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE ||
       navigation_type == FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE ||
       navigation_type == FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;
   if (is_reload)

content/browser/frame_host/navigator_impl.cc

@@ -58,7 +58,7 @@ FrameMsg_Navigate_Type::Value GetNavigationType(
     ReloadType reload_type) {
   switch (reload_type) {
     case ReloadType::NORMAL:
-      return FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE;
+      return FrameMsg_Navigate_Type::RELOAD;
     case ReloadType::BYPASSING_CACHE:
     case ReloadType::DISABLE_LOFI_MODE:
       return FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE;

content/browser/frame_host/navigator_impl_unittest.cc

@@ -834,7 +834,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) {
   // A NavigationRequest should have been generated.
   NavigationRequest* main_request = node->navigation_request();
   ASSERT_TRUE(main_request != NULL);
-  EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE,
+  EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD,
             main_request->common_params().navigation_type);
   main_test_rfh()->PrepareForCommit();
   EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

content/common/frame_message_enums.h

@@ -10,13 +10,8 @@
 struct FrameMsg_Navigate_Type {
  public:
   enum Value {
-    // Reload the page, validating cache entries.
-    RELOAD,
-
     // Reload the page, validating only cache entry for the main resource.
-    // TODO(toyoshim): We should rename this one to be RELOAD and remove the old
-    // unused RELOAD behavior.
-    RELOAD_MAIN_RESOURCE,
+    RELOAD,
 
     // Reload the page, bypassing any cache entries.
     RELOAD_BYPASSING_CACHE,

content/renderer/render_frame_impl.cc

@@ -656,7 +656,6 @@ media::Context3D GetSharedMainThreadContext3D(
 bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
   switch (navigation_type) {
     case FrameMsg_Navigate_Type::RELOAD:
-    case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
     case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
     case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
       return true;
@@ -674,8 +673,6 @@ WebFrameLoadType ReloadFrameLoadTypeFor(
   switch (navigation_type) {
     case FrameMsg_Navigate_Type::RELOAD:
     case FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL:
-      return WebFrameLoadType::Reload;
-    case FrameMsg_Navigate_Type::RELOAD_MAIN_RESOURCE:
       return WebFrameLoadType::ReloadMainResource;
     case FrameMsg_Navigate_Type::RELOAD_BYPASSING_CACHE:
       return WebFrameLoadType::ReloadBypassingCache;
@@ -6356,6 +6353,7 @@ void RenderFrameImpl::LoadDataURL(
     const GURL base_url = params.base_url_for_data_url.is_empty() ?
         params.url : params.base_url_for_data_url;
     bool replace = load_type == WebFrameLoadType::ReloadBypassingCache ||
+                   load_type == WebFrameLoadType::ReloadMainResource ||
                    load_type == WebFrameLoadType::Reload;
 
     frame->loadData(