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

components/test_runner/test_runner.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 117 matching lines @@
   bool shouldDumpTitleChanges() const;
   bool shouldDumpIconChanges() const;
   bool shouldDumpCreateView() const;
   bool canOpenWindows() const;
   bool shouldDumpResourceLoadCallbacks() const;
   bool shouldDumpResourceResponseMIMETypes() const;
   bool shouldDumpStatusCallbacks() const;
   bool shouldDumpSpellCheckCallbacks() const;
   bool shouldWaitUntilExternalURLLoad() const;
   const std::set<std::string>* httpHeadersToClear() const;
-  void setTopLoadingFrame(blink::WebFrame*, bool);
+
+  // To be called when |frame| starts loading - TestRunner will check if
+  // there is currently no top-loading-frame being tracked and if so, then it
+  // will return true and start tracking |frame| as the top-loading-frame.
+  bool tryToSetTopLoadingFrame(blink::WebFrame* frame);
+
+  // To be called when |frame| finishes loading - TestRunner will check if
+  // |frame| is currently tracked as the top-loading-frame, and if yes, then it
+  // will return true, stop top-loading-frame tracking, and potentially finish
+  // the test (unless testRunner.waitUntilDone() was called and/or there are
+  // pending load requests in WorkQueue).
+  bool tryToClearTopLoadingFrame(blink::WebFrame*);
+
   blink::WebFrame* topLoadingFrame() const;
   void policyDelegateDone();
   bool policyDelegateEnabled() const;
   bool policyDelegateIsPermissive() const;
   bool policyDelegateShouldNotifyDone() const;
   bool shouldInterceptPostMessage() const;
   bool shouldDumpResourcePriorities() const;
   void setToolTipText(const blink::WebString&);
   void setDragImage(const blink::WebImage& drag_image);
   bool shouldDumpNavigationPolicy() const;
@@ skipping 374 matching lines @@
                                         const std::string& password);
   void AddMockCredentialManagerError(const std::string& error);
 
   // Takes care of notifying the delegate after a change to layout test runtime
   // flags.
   void OnLayoutTestRuntimeFlagsChanged();
 
   ///////////////////////////////////////////////////////////////////////////
   // Internal helpers
 
+  bool IsFramePartOfMainTestWindow(blink::WebFrame*) const;

[Łukasz Anforowicz, 2016/04/27 17:06:53]

This belongs in "private" part of TestRunner class (I moved it here compared to
the previous patchset + named the method following Chromium, rather than Blink
style).

+
   void CheckResponseMimeType();
   void CompleteNotifyDone();
 
   // In the Mac code, this is called to trigger the end of a test after the
   // page has finished loading. From here, we can generate the dump for the
   // test.
   void LocationChangeDone();
 
   bool test_is_running_;
 
@@ skipping 285 matching lines @@
   WebTestProxyBase* web_test_proxy_base_;
 
   base::WeakPtrFactory<TestRunnerForSpecificView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunnerForSpecificView);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_