content/public/test/render_view_test.cc - Issue 537023002: Change ScriptContextTest.GetEffectiveDocumentURL to use FrameLoadWaiter and re-enable the test.

Side by Side Diff: content/public/test/render_view_test.cc

Issue 537023002: Change ScriptContextTest.GetEffectiveDocumentURL to use FrameLoadWaiter and re-enable the test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « content/public/test/frame_load_waiter.cc ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

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 #include "content/public/test/render_view_test.h"	5 #include "content/public/test/render_view_test.h"

6	6

7 #include "base/run_loop.h"	7 #include "base/run_loop.h"

8 #include "content/common/dom_storage/dom_storage_types.h"	8 #include "content/common/dom_storage/dom_storage_types.h"

9 #include "content/common/frame_messages.h"	9 #include "content/common/frame_messages.h"

10 #include "content/common/input_messages.h"	10 #include "content/common/input_messages.h"

11 #include "content/common/view_messages.h"	11 #include "content/common/view_messages.h"

12 #include "content/public/browser/content_browser_client.h"	12 #include "content/public/browser/content_browser_client.h"

13 #include "content/public/browser/native_web_keyboard_event.h"	13 #include "content/public/browser/native_web_keyboard_event.h"

14 #include "content/public/common/content_client.h"	14 #include "content/public/common/content_client.h"

15 #include "content/public/common/renderer_preferences.h"	15 #include "content/public/common/renderer_preferences.h"

16 #include "content/public/renderer/content_renderer_client.h"	16 #include "content/public/renderer/content_renderer_client.h"

	17 #include "content/public/test/frame_load_waiter.h"

17 #include "content/renderer/history_controller.h"	18 #include "content/renderer/history_controller.h"

18 #include "content/renderer/history_serialization.h"	19 #include "content/renderer/history_serialization.h"

19 #include "content/renderer/render_thread_impl.h"	20 #include "content/renderer/render_thread_impl.h"

20 #include "content/renderer/render_view_impl.h"	21 #include "content/renderer/render_view_impl.h"

21 #include "content/renderer/renderer_main_platform_delegate.h"	22 #include "content/renderer/renderer_main_platform_delegate.h"

22 #include "content/renderer/renderer_webkitplatformsupport_impl.h"	23 #include "content/renderer/renderer_webkitplatformsupport_impl.h"

23 #include "content/test/frame_load_waiter.h"

24 #include "content/test/mock_render_process.h"	24 #include "content/test/mock_render_process.h"

25 #include "third_party/WebKit/public/platform/WebScreenInfo.h"	25 #include "third_party/WebKit/public/platform/WebScreenInfo.h"

26 #include "third_party/WebKit/public/platform/WebURLRequest.h"	26 #include "third_party/WebKit/public/platform/WebURLRequest.h"

27 #include "third_party/WebKit/public/web/WebHistoryItem.h"	27 #include "third_party/WebKit/public/web/WebHistoryItem.h"

28 #include "third_party/WebKit/public/web/WebInputEvent.h"	28 #include "third_party/WebKit/public/web/WebInputEvent.h"

29 #include "third_party/WebKit/public/web/WebKit.h"	29 #include "third_party/WebKit/public/web/WebKit.h"

30 #include "third_party/WebKit/public/web/WebLocalFrame.h"	30 #include "third_party/WebKit/public/web/WebLocalFrame.h"

31 #include "third_party/WebKit/public/web/WebScriptSource.h"	31 #include "third_party/WebKit/public/web/WebScriptSource.h"

32 #include "third_party/WebKit/public/web/WebView.h"	32 #include "third_party/WebKit/public/web/WebView.h"

33 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

(...skipping 388 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
422 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),	422 FrameMsg_Navigate navigate_message(impl->main_render_frame()->GetRoutingID(),

423 navigate_params);	423 navigate_params);

424 impl->main_render_frame()->OnMessageReceived(navigate_message);	424 impl->main_render_frame()->OnMessageReceived(navigate_message);

425	425

426 // The load actually happens asynchronously, so we pump messages to process	426 // The load actually happens asynchronously, so we pump messages to process

427 // the pending continuation.	427 // the pending continuation.

428 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();	428 FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();

429 }	429 }

430	430

431 } // namespace content	431 } // namespace content

OLD	NEW