Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1471)

Unified Diff: content/shell/browser/layout_test/blink_test_controller.h

Issue 1890223002: Explicitly initialize secondary renderers for layout tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing... Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/blink_test_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/layout_test/blink_test_controller.h
diff --git a/content/shell/browser/layout_test/blink_test_controller.h b/content/shell/browser/layout_test/blink_test_controller.h
index 602438c737eb85d17f81cbd67cdd72763d5eaddb..ea352288b4f07109ce0b8606bf0950941db8ec94 100644
--- a/content/shell/browser/layout_test/blink_test_controller.h
+++ b/content/shell/browser/layout_test/blink_test_controller.h
@@ -8,6 +8,7 @@
#include <map>
#include <memory>
#include <ostream>
+#include <set>
#include <string>
#include "base/cancelable_callback.h"
@@ -133,6 +134,11 @@ class BlinkTestController : public base::NonThreadSafe,
// True if the controller was reset successfully.
bool ResetAfterLayoutTest();
+ // Makes sure that the potentially new renderer associated with |frame| is 1)
+ // initialized for the test, 2) kept-up-to-date wrt test flags and 3)
+ // monitored for crashes.
+ void HandleNewRenderFrameHost(RenderFrameHost* frame);
+
void SetTempPath(const base::FilePath& temp_path);
void RendererUnresponsive();
void OverrideWebkitPrefs(WebPreferences* prefs);
@@ -184,8 +190,6 @@ class BlinkTestController : public base::NonThreadSafe,
static BlinkTestController* instance_;
void DiscardMainWindow();
- void HandleNewRenderFrameHost(
- RenderFrameHost* frame_representing_target_process);
// Message handlers.
void OnAudioDump(const std::vector<unsigned char>& audio_dump);
@@ -266,6 +270,8 @@ class BlinkTestController : public base::NonThreadSafe,
// Renderer processes are observed to detect crashes.
ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
render_process_host_observer_;
+ std::set<RenderProcessHost*> all_observed_render_process_hosts_;
+ std::set<RenderProcessHost*> main_window_render_process_hosts_;
// Changes reported by OnLayoutTestRuntimeFlagsChanged that have accumulated
// since PrepareForLayoutTest (i.e. changes that need to be send to a fresh
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/blink_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698