Index: components/test_runner/web_frame_test_client.cc |
diff --git a/components/test_runner/web_frame_test_client.cc b/components/test_runner/web_frame_test_client.cc |
index 0af3babda9dcc53cd8ee3451384e4e8ed8b3049b..d8e628718d38c022310f1f39df2ecf2d1fbffbc5 100644 |
--- a/components/test_runner/web_frame_test_client.cc |
+++ b/components/test_runner/web_frame_test_client.cc |
@@ -188,12 +188,10 @@ enum CheckDoneReason { |
void CheckDone(blink::WebLocalFrame* frame, |
CheckDoneReason reason, |
TestRunner* test_runner) { |
- if (frame != test_runner->topLoadingFrame()) |
- return; |
if (reason != MainResourceLoadFailed && |
(frame->isResourceLoadInProgress() || frame->isLoading())) |
return; |
- test_runner->setTopLoadingFrame(frame, true); |
+ test_runner->tryToClearTopLoadingFrame(frame); |
} |
} // namespace |
@@ -430,8 +428,7 @@ void WebFrameTestClient::loadURLExternally( |
void WebFrameTestClient::didStartProvisionalLoad(blink::WebLocalFrame* frame, |
double trigering_event_time) { |
- if (!test_runner_->topLoadingFrame()) |
- test_runner_->setTopLoadingFrame(frame, false); |
+ test_runner_->tryToSetTopLoadingFrame(frame); |
if (test_runner_->shouldDumpFrameLoadCallbacks()) { |
PrintFrameDescription(delegate_, frame); |