Split TestRunner::setTopLoadingFrame into separate "set" and "clear" methods.

components/test_runner/web_frame_test_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/test_runner/web_frame_test_client.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
@@ skipping 170 matching lines @@
 }
 
 enum CheckDoneReason {
   LoadFinished,
   MainResourceLoadFailed,
   ResourceLoadCompleted
 };
 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
 
 WebFrameTestClient::WebFrameTestClient(
     TestRunner* test_runner,
     WebTestDelegate* delegate,
     WebTestProxyBase* web_test_proxy_base)
     : test_runner_(test_runner),
       delegate_(delegate),
@@ skipping 216 matching lines @@
     } else {
       delegate_->PrintMessage(std::string("Loading URL externally - \"") +
                               URLDescription(request.url()) + "\"\n");
     }
     delegate_->TestFinished();
   }
 }
 
 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);
     delegate_->PrintMessage(" - didStartProvisionalLoadForFrame\n");
   }
 
   if (test_runner_->shouldDumpUserGestureInFrameLoadCallbacks()) {
     PrintFrameuserGestureStatus(delegate_, frame,
                                 " - in didStartProvisionalLoadForFrame\n");
   }
@@ skipping 324 matching lines @@
   else
     callback->onError(blink::WebSetSinkIdError::NotFound);
 }
 
 void WebFrameTestClient::didClearWindowObject(blink::WebLocalFrame* frame) {
   web_test_proxy_base_->test_interfaces()->BindTo(frame);
   web_test_proxy_base_->BindTo(frame);
 }
 
 }  // namespace test_runner