| Index: content/public/test/test_frame_navigation_observer.cc
|
| diff --git a/content/test/test_frame_navigation_observer.cc b/content/public/test/test_frame_navigation_observer.cc
|
| similarity index 79%
|
| rename from content/test/test_frame_navigation_observer.cc
|
| rename to content/public/test/test_frame_navigation_observer.cc
|
| index 002a987d46f3988e1320b82e5bfdbb5970e30d0e..3656a4c82266d44110408c697d073a523d8e8881 100644
|
| --- a/content/test/test_frame_navigation_observer.cc
|
| +++ b/content/public/test/test_frame_navigation_observer.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/test/test_frame_navigation_observer.h"
|
| +#include "content/public/test/test_frame_navigation_observer.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -17,19 +17,18 @@
|
|
|
| namespace content {
|
|
|
| -TestFrameNavigationObserver::TestFrameNavigationObserver(
|
| - FrameTreeNode* node)
|
| - : WebContentsObserver(
|
| - node->current_frame_host()->delegate()->GetAsWebContents()),
|
| - frame_tree_node_id_(node->frame_tree_node_id()),
|
| +TestFrameNavigationObserver::TestFrameNavigationObserver(RenderFrameHost* frame)
|
| + : WebContentsObserver(static_cast<RenderFrameHostImpl*>(frame)
|
| + ->delegate()
|
| + ->GetAsWebContents()),
|
| + frame_tree_node_id_(
|
| + static_cast<RenderFrameHostImpl*>(frame)->GetFrameTreeNodeId()),
|
| navigation_started_(false),
|
| has_committed_(false),
|
| wait_for_commit_(false),
|
| - message_loop_runner_(new MessageLoopRunner) {
|
| -}
|
| + message_loop_runner_(new MessageLoopRunner) {}
|
|
|
| -TestFrameNavigationObserver::~TestFrameNavigationObserver() {
|
| -}
|
| +TestFrameNavigationObserver::~TestFrameNavigationObserver() {}
|
|
|
| void TestFrameNavigationObserver::Wait() {
|
| wait_for_commit_ = false;
|
|
|