Index: content/public/test/render_view_test.cc |
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc |
index 33c0fdb93cefd30bf1c3e4ed7a526e9b3279e578..dbbb60777e73bc1bb6f43856bf6be9f4ac2d6a3c 100644 |
--- a/content/public/test/render_view_test.cc |
+++ b/content/public/test/render_view_test.cc |
@@ -14,6 +14,7 @@ |
#include "content/public/common/content_client.h" |
#include "content/public/common/renderer_preferences.h" |
#include "content/public/renderer/content_renderer_client.h" |
+#include "content/public/test/frame_load_waiter.h" |
#include "content/renderer/history_controller.h" |
#include "content/renderer/history_serialization.h" |
#include "content/renderer/render_thread_impl.h" |
@@ -117,12 +118,10 @@ void RenderViewTest::LoadHTML(const char* html) { |
std::string url_str = "data:text/html;charset=utf-8,"; |
url_str.append(html); |
GURL url(url_str); |
- |
GetMainFrame()->loadRequest(WebURLRequest(url)); |
- |
// The load actually happens asynchronously, so we pump messages to process |
// the pending continuation. |
- ProcessPendingMessages(); |
+ FrameLoadWaiter(view_).Wait(); |
} |
void RenderViewTest::GoBack(const blink::WebHistoryItem& item) { |