Loader: Move files in core/loader/private/ into core/loader/

Only a few files exist in core/loader/private/. Having the `private`
sub-directory seems to no longer make sense. This CL moves files there
into core/loader.

Bug: n/a
Change-Id: I8475b8b9401688432016c7d3ad5ff17e6adb3f60
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2400646
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837091}

third_party/blink/renderer/core/loader/base_fetch_context.cc

@@ -13,8 +13,8 @@
 #include "third_party/blink/renderer/core/frame/settings.h"
 #include "third_party/blink/renderer/core/frame/web_feature.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
+#include "third_party/blink/renderer/core/loader/frame_client_hints_preferences_context.h"
 #include "third_party/blink/renderer/core/loader/previews_resource_loading_hints.h"
-#include "third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.h"
 #include "third_party/blink/renderer/core/loader/subresource_filter.h"
 #include "third_party/blink/renderer/platform/exported/wrapped_resource_request.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"

third_party/blink/renderer/core/loader/build.gni

@@ -31,6 +31,8 @@ blink_core_sources_loader = [
   "font_preload_manager.h",
   "form_submission.cc",
   "form_submission.h",
+  "frame_client_hints_preferences_context.cc",
+  "frame_client_hints_preferences_context.h",
   "frame_fetch_context.cc",
   "frame_fetch_context.h",
   "frame_load_request.cc",
@@ -100,12 +102,10 @@ blink_core_sources_loader = [
   "prefetched_signed_exchange_manager.h",
   "preload_helper.cc",
   "preload_helper.h",
+  "prerender_handle.cc",
+  "prerender_handle.h",
   "previews_resource_loading_hints.cc",
   "previews_resource_loading_hints.h",
-  "private/frame_client_hints_preferences_context.cc",
-  "private/frame_client_hints_preferences_context.h",
-  "private/prerender_handle.cc",
-  "private/prerender_handle.h",
   "progress_tracker.cc",
   "progress_tracker.h",
   "resource/css_style_sheet_resource.cc",

third_party/blink/renderer/core/loader/document_loader.cc

@@ -70,6 +70,7 @@
 #include "third_party/blink/renderer/core/inspector/main_thread_debugger.h"
 #include "third_party/blink/renderer/core/loader/alternate_signed_exchange_resource_info.h"
 #include "third_party/blink/renderer/core/loader/appcache/application_cache_host_for_frame.h"
+#include "third_party/blink/renderer/core/loader/frame_client_hints_preferences_context.h"
 #include "third_party/blink/renderer/core/loader/frame_fetch_context.h"
 #include "third_party/blink/renderer/core/loader/frame_loader.h"
 #include "third_party/blink/renderer/core/loader/idleness_detector.h"
@@ -77,7 +78,6 @@
 #include "third_party/blink/renderer/core/loader/mixed_content_checker.h"
 #include "third_party/blink/renderer/core/loader/prefetched_signed_exchange_manager.h"
 #include "third_party/blink/renderer/core/loader/preload_helper.h"
-#include "third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.h"
 #include "third_party/blink/renderer/core/loader/progress_tracker.h"
 #include "third_party/blink/renderer/core/loader/subresource_filter.h"
 #include "third_party/blink/renderer/core/origin_trials/origin_trial_context.h"

third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.cc → third_party/blink/renderer/core/loader/frame_client_hints_preferences_context.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.h"
+#include "third_party/blink/renderer/core/loader/frame_client_hints_preferences_context.h"
 
 #include "base/stl_util.h"
 #include "third_party/blink/renderer/core/dom/document.h"

third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.h → third_party/blink/renderer/core/loader/frame_client_hints_preferences_context.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRIVATE_FRAME_CLIENT_HINTS_PREFERENCES_CONTEXT_H_
-#define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRIVATE_FRAME_CLIENT_HINTS_PREFERENCES_CONTEXT_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_FRAME_CLIENT_HINTS_PREFERENCES_CONTEXT_H_
+#define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_FRAME_CLIENT_HINTS_PREFERENCES_CONTEXT_H_
 
 #include "third_party/blink/renderer/platform/heap/persistent.h"
 #include "third_party/blink/renderer/platform/loader/fetch/client_hints_preferences.h"
@@ -28,4 +28,4 @@ class FrameClientHintsPreferencesContext final
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRIVATE_FRAME_CLIENT_HINTS_PREFERENCES_CONTEXT_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_FRAME_CLIENT_HINTS_PREFERENCES_CONTEXT_H_

third_party/blink/renderer/core/loader/http_equiv.cc

@@ -15,7 +15,7 @@
 #include "third_party/blink/renderer/core/frame/settings.h"
 #include "third_party/blink/renderer/core/inspector/console_message.h"
 #include "third_party/blink/renderer/core/loader/document_loader.h"
-#include "third_party/blink/renderer/core/loader/private/frame_client_hints_preferences_context.h"
+#include "third_party/blink/renderer/core/loader/frame_client_hints_preferences_context.h"
 #include "third_party/blink/renderer/core/origin_trials/origin_trial_context.h"
 #include "third_party/blink/renderer/platform/bindings/v8_binding.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"

third_party/blink/renderer/core/loader/link_loader.cc

@@ -39,7 +39,7 @@
 #include "third_party/blink/renderer/core/loader/link_load_parameters.h"
 #include "third_party/blink/renderer/core/loader/link_loader_client.h"
 #include "third_party/blink/renderer/core/loader/preload_helper.h"
-#include "third_party/blink/renderer/core/loader/private/prerender_handle.h"
+#include "third_party/blink/renderer/core/loader/prerender_handle.h"
 #include "third_party/blink/renderer/core/loader/resource/css_style_sheet_resource.h"
 #include "third_party/blink/renderer/core/loader/subresource_integrity_helper.h"
 #include "third_party/blink/renderer/core/page/viewport_description.h"

third_party/blink/renderer/core/loader/private/prerender_handle.cc → third_party/blink/renderer/core/loader/prerender_handle.cc

@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "third_party/blink/renderer/core/loader/private/prerender_handle.h"
+#include "third_party/blink/renderer/core/loader/prerender_handle.h"
 
 #include "services/network/public/mojom/referrer_policy.mojom-blink.h"
 #include "third_party/blink/public/common/browser_interface_broker_proxy.h"

third_party/blink/renderer/core/loader/private/prerender_handle.h → third_party/blink/renderer/core/loader/prerender_handle.h

@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRIVATE_PRERENDER_HANDLE_H_
-#define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRIVATE_PRERENDER_HANDLE_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRERENDER_HANDLE_H_
+#define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRERENDER_HANDLE_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_refptr.h"
@@ -88,4 +88,4 @@ class PrerenderHandle final : public GarbageCollected<PrerenderHandle> {
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRIVATE_PRERENDER_HANDLE_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_PRERENDER_HANDLE_H_