| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_PUBLIC_TEST_TEST_NAVIGATION_OBSERVER_H_ | 5 #ifndef CONTENT_PUBLIC_TEST_TEST_NAVIGATION_OBSERVER_H_ |
| 6 #define CONTENT_PUBLIC_TEST_TEST_NAVIGATION_OBSERVER_H_ | 6 #define CONTENT_PUBLIC_TEST_TEST_NAVIGATION_OBSERVER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 // True if the last navigation succeeded. | 90 // True if the last navigation succeeded. |
| 91 bool last_navigation_succeeded_; | 91 bool last_navigation_succeeded_; |
| 92 | 92 |
| 93 // The MessageLoopRunner used to spin the message loop. | 93 // The MessageLoopRunner used to spin the message loop. |
| 94 scoped_refptr<MessageLoopRunner> message_loop_runner_; | 94 scoped_refptr<MessageLoopRunner> message_loop_runner_; |
| 95 | 95 |
| 96 // Callback invoked on WebContents creation. | 96 // Callback invoked on WebContents creation. |
| 97 base::Callback<void(WebContents*)> web_contents_created_callback_; | 97 base::Callback<void(WebContents*)> web_contents_created_callback_; |
| 98 | 98 |
| 99 // Living TestWebContentsObservers created by this observer. | 99 // Living TestWebContentsObservers created by this observer. |
| 100 std::set<TestWebContentsObserver*> web_contents_observers_; | 100 std::set<std::unique_ptr<TestWebContentsObserver>> web_contents_observers_; |
| 101 | 101 |
| 102 DISALLOW_COPY_AND_ASSIGN(TestNavigationObserver); | 102 DISALLOW_COPY_AND_ASSIGN(TestNavigationObserver); |
| 103 }; | 103 }; |
| 104 | 104 |
| 105 } // namespace content | 105 } // namespace content |
| 106 | 106 |
| 107 #endif // CONTENT_PUBLIC_TEST_TEST_NAVIGATION_OBSERVER_H_ | 107 #endif // CONTENT_PUBLIC_TEST_TEST_NAVIGATION_OBSERVER_H_ |
| OLD | NEW |