[WebLayer] Componentize PrerenderObserverList.

Componentize PrerenderObserver and PrerenderObserverList so WebLayer can use it
to support NoStatePrefetch.

Bug: 1096088
Change-Id: I6012e2a5699d21dc695cad913772f072986cd8f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2308725Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Commit-Queue: Mugdha Lakhani <nator@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790755}

chrome/renderer/BUILD.gn

@@ -92,9 +92,6 @@ static_library("renderer") {
     "plugins/pdf_plugin_placeholder.h",
     "plugins/plugin_uma.cc",
     "plugins/plugin_uma.h",
-    "prerender/prerender_observer.h",
-    "prerender/prerender_observer_list.cc",
-    "prerender/prerender_observer_list.h",
     "prerender/prerenderer_client.cc",
     "prerender/prerenderer_client.h",
     "previews/resource_loading_hints_agent.cc",

chrome/renderer/chrome_render_frame_observer.cc

@@ -24,11 +24,11 @@
 #include "chrome/common/open_search_description_document_handler.mojom.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/media/media_feeds.h"
-#include "chrome/renderer/prerender/prerender_observer_list.h"
 #include "chrome/renderer/web_apps.h"
 #include "components/crash/core/common/crash_key.h"
 #include "components/offline_pages/buildflags/buildflags.h"
 #include "components/prerender/renderer/prerender_helper.h"
+#include "components/prerender/renderer/prerender_observer_list.h"
 #include "components/translate/content/renderer/translate_agent.h"
 #include "components/translate/core/common/translate_util.h"
 #include "components/web_cache/renderer/web_cache_impl.h"

chrome/renderer/plugins/chrome_plugin_placeholder.cc

@@ -22,8 +22,8 @@
 #include "chrome/renderer/custom_menu_commands.h"
 #include "chrome/renderer/plugins/plugin_preroller.h"
 #include "chrome/renderer/plugins/plugin_uma.h"
-#include "chrome/renderer/prerender/prerender_observer_list.h"
 #include "components/content_settings/renderer/content_settings_agent_impl.h"
+#include "components/prerender/renderer/prerender_observer_list.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/untrustworthy_context_menu_params.h"

chrome/renderer/plugins/chrome_plugin_placeholder.h

@@ -12,9 +12,9 @@
 #include "chrome/common/buildflags.h"
 #include "chrome/common/plugin.mojom.h"
 #include "chrome/renderer/plugins/power_saver_info.h"
-#include "chrome/renderer/prerender/prerender_observer.h"
 #include "components/plugins/renderer/loadable_plugin_placeholder.h"
 #include "components/prerender/common/prerender_types.mojom.h"
+#include "components/prerender/renderer/prerender_observer.h"
 #include "content/public/renderer/context_menu_client.h"
 #include "content/public/renderer/render_thread_observer.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"

components/prerender/renderer/BUILD.gn

@@ -6,6 +6,9 @@ static_library("renderer") {
   sources = [
     "prerender_helper.cc",
     "prerender_helper.h",
+    "prerender_observer.h",
+    "prerender_observer_list.cc",
+    "prerender_observer_list.h",
   ]
 
   deps = [

chrome/renderer/prerender/prerender_observer.h → components/prerender/renderer/prerender_observer.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 CHROME_RENDERER_PRERENDER_PRERENDER_OBSERVER_H_
-#define CHROME_RENDERER_PRERENDER_PRERENDER_OBSERVER_H_
+#ifndef COMPONENTS_PRERENDER_RENDERER_PRERENDER_OBSERVER_H_
+#define COMPONENTS_PRERENDER_RENDERER_PRERENDER_OBSERVER_H_
 
 #include "base/observer_list_types.h"
 
@@ -20,4 +20,4 @@ class PrerenderObserver : public base::CheckedObserver {
 
 }  // namespace prerender
 
-#endif  // CHROME_RENDERER_PRERENDER_PRERENDER_OBSERVER_H_
+#endif  // COMPONENTS_PRERENDER_RENDERER_PRERENDER_OBSERVER_H_

chrome/renderer/prerender/prerender_observer_list.cc → components/prerender/renderer/prerender_observer_list.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/prerender/prerender_observer_list.h"
+#include "components/prerender/renderer/prerender_observer_list.h"
 
-#include "chrome/renderer/prerender/prerender_observer.h"
+#include "components/prerender/renderer/prerender_observer.h"
 #include "content/public/renderer/render_frame.h"
 
 namespace prerender {

chrome/renderer/prerender/prerender_observer_list.h → components/prerender/renderer/prerender_observer_list.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 CHROME_RENDERER_PRERENDER_PRERENDER_OBSERVER_LIST_H_
-#define CHROME_RENDERER_PRERENDER_PRERENDER_OBSERVER_LIST_H_
+#ifndef COMPONENTS_PRERENDER_RENDERER_PRERENDER_OBSERVER_LIST_H_
+#define COMPONENTS_PRERENDER_RENDERER_PRERENDER_OBSERVER_LIST_H_
 
 #include "base/observer_list.h"
 #include "base/supports_user_data.h"
@@ -47,4 +47,4 @@ class PrerenderObserverList : public base::SupportsUserData::Data {
 
 }  // namespace prerender
 
-#endif  // CHROME_RENDERER_PRERENDER_PRERENDER_OBSERVER_LIST_H_
+#endif  // COMPONENTS_PRERENDER_RENDERER_PRERENDER_OBSERVER_LIST_H_