| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ | 5 #ifndef CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ |
| 6 #define CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ | 6 #define CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/run_loop.h" |
| 14 #include "content/public/browser/web_contents_observer.h" | 15 #include "content/public/browser/web_contents_observer.h" |
| 15 #include "content/public/test/browser_test_utils.h" | 16 #include "content/public/test/browser_test_utils.h" |
| 16 #include "content/public/test/test_utils.h" | 17 #include "content/public/test/test_utils.h" |
| 17 | 18 |
| 18 class GURL; | 19 class GURL; |
| 19 | 20 |
| 20 namespace content { | 21 namespace content { |
| 21 class RenderFrameHost; | 22 class RenderFrameHost; |
| 22 | 23 |
| 23 // Helper for waiting until the navigation in a specific frame tree node (and | 24 // Helper for waiting until the navigation in a specific frame tree node (and |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 // If true the navigation has started. | 58 // If true the navigation has started. |
| 58 bool navigation_started_; | 59 bool navigation_started_; |
| 59 | 60 |
| 60 // If true, the navigation has committed. | 61 // If true, the navigation has committed. |
| 61 bool has_committed_; | 62 bool has_committed_; |
| 62 | 63 |
| 63 // If true, this object is waiting for commit only, not for the full load | 64 // If true, this object is waiting for commit only, not for the full load |
| 64 // of the document. | 65 // of the document. |
| 65 bool wait_for_commit_; | 66 bool wait_for_commit_; |
| 66 | 67 |
| 67 // The MessageLoopRunner used to spin the message loop. | 68 // The RunLoop used to spin the message loop. |
| 68 scoped_refptr<MessageLoopRunner> message_loop_runner_; | 69 base::RunLoop run_loop_; |
| 69 | 70 |
| 70 DISALLOW_COPY_AND_ASSIGN(TestFrameNavigationObserver); | 71 DISALLOW_COPY_AND_ASSIGN(TestFrameNavigationObserver); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 } // namespace content | 74 } // namespace content |
| 74 | 75 |
| 75 #endif // CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ | 76 #endif // CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ |
| OLD | NEW |