| 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 #include "content/test/content_browser_test_utils_internal.h" | 5 #include "content/test/content_browser_test_utils_internal.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 return TestNavigationManager::ShouldMonitorNavigation(handle) && | 372 return TestNavigationManager::ShouldMonitorNavigation(handle) && |
| 373 handle->GetFrameTreeNodeId() == filtering_frame_tree_node_id_; | 373 handle->GetFrameTreeNodeId() == filtering_frame_tree_node_id_; |
| 374 } | 374 } |
| 375 | 375 |
| 376 UrlCommitObserver::UrlCommitObserver(FrameTreeNode* frame_tree_node, | 376 UrlCommitObserver::UrlCommitObserver(FrameTreeNode* frame_tree_node, |
| 377 const GURL& url) | 377 const GURL& url) |
| 378 : content::WebContentsObserver(frame_tree_node->current_frame_host() | 378 : content::WebContentsObserver(frame_tree_node->current_frame_host() |
| 379 ->delegate() | 379 ->delegate() |
| 380 ->GetAsWebContents()), | 380 ->GetAsWebContents()), |
| 381 frame_tree_node_id_(frame_tree_node->frame_tree_node_id()), | 381 frame_tree_node_id_(frame_tree_node->frame_tree_node_id()), |
| 382 url_(url), | 382 url_(url) { |
| 383 message_loop_runner_( | |
| 384 new MessageLoopRunner(MessageLoopRunner::QuitMode::IMMEDIATE)) { | |
| 385 } | 383 } |
| 386 | 384 |
| 387 UrlCommitObserver::~UrlCommitObserver() {} | 385 UrlCommitObserver::~UrlCommitObserver() {} |
| 388 | 386 |
| 389 void UrlCommitObserver::Wait() { | 387 void UrlCommitObserver::Wait() { |
| 390 message_loop_runner_->Run(); | 388 run_loop_.Run(); |
| 391 } | 389 } |
| 392 | 390 |
| 393 void UrlCommitObserver::DidFinishNavigation( | 391 void UrlCommitObserver::DidFinishNavigation( |
| 394 NavigationHandle* navigation_handle) { | 392 NavigationHandle* navigation_handle) { |
| 395 if (navigation_handle->HasCommitted() && | 393 if (navigation_handle->HasCommitted() && |
| 396 !navigation_handle->IsErrorPage() && | 394 !navigation_handle->IsErrorPage() && |
| 397 navigation_handle->GetURL() == url_ && | 395 navigation_handle->GetURL() == url_ && |
| 398 navigation_handle->GetFrameTreeNodeId() == frame_tree_node_id_) { | 396 navigation_handle->GetFrameTreeNodeId() == frame_tree_node_id_) { |
| 399 message_loop_runner_->Quit(); | 397 run_loop_.Quit(); |
| 400 } | 398 } |
| 401 } | 399 } |
| 402 | 400 |
| 403 } // namespace content | 401 } // namespace content |
| OLD | NEW |