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/test/render_view_fake_resources_test.h" | 5 #include "content/test/render_view_fake_resources_test.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include "base/process.h" | 9 #include "base/process.h" |
10 #include "base/shared_memory.h" | 10 #include "base/shared_memory.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 mock_process_.reset(new MockRenderProcess); | 65 mock_process_.reset(new MockRenderProcess); |
66 render_thread_ = new RenderThreadImpl(kThreadName); | 66 render_thread_ = new RenderThreadImpl(kThreadName); |
67 | 67 |
68 // Tell the renderer to create a view, then wait until it's ready. | 68 // Tell the renderer to create a view, then wait until it's ready. |
69 // We can't call View::Create() directly here or else we won't get | 69 // We can't call View::Create() directly here or else we won't get |
70 // RenderProcess's lazy initialization of WebKit. | 70 // RenderProcess's lazy initialization of WebKit. |
71 view_ = NULL; | 71 view_ = NULL; |
72 ViewMsg_New_Params params; | 72 ViewMsg_New_Params params; |
73 params.parent_window = 0; | 73 params.parent_window = 0; |
74 params.view_id = kViewId; | 74 params.view_id = kViewId; |
| 75 params.opener_route_id = MSG_ROUTING_NONE; |
75 params.session_storage_namespace_id = | 76 params.session_storage_namespace_id = |
76 dom_storage::kInvalidSessionStorageNamespaceId; | 77 dom_storage::kInvalidSessionStorageNamespaceId; |
77 ASSERT_TRUE(channel_->Send(new ViewMsg_New(params))); | 78 ASSERT_TRUE(channel_->Send(new ViewMsg_New(params))); |
78 message_loop_.Run(); | 79 message_loop_.Run(); |
79 } | 80 } |
80 | 81 |
81 void RenderViewFakeResourcesTest::TearDown() { | 82 void RenderViewFakeResourcesTest::TearDown() { |
82 // Try very hard to collect garbage before shutting down. | 83 // Try very hard to collect garbage before shutting down. |
83 GetMainFrame()->collectGarbage(); | 84 GetMainFrame()->collectGarbage(); |
84 GetMainFrame()->collectGarbage(); | 85 GetMainFrame()->collectGarbage(); |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 params.current_history_list_length = (impl->historyBackListCount() + | 192 params.current_history_list_length = (impl->historyBackListCount() + |
192 impl->historyForwardListCount() + 1); | 193 impl->historyForwardListCount() + 1); |
193 params.url = GURL(history_item.urlString()); | 194 params.url = GURL(history_item.urlString()); |
194 params.transition = content::PAGE_TRANSITION_FORWARD_BACK; | 195 params.transition = content::PAGE_TRANSITION_FORWARD_BACK; |
195 params.state = webkit_glue::HistoryItemToString(history_item); | 196 params.state = webkit_glue::HistoryItemToString(history_item); |
196 params.navigation_type = ViewMsg_Navigate_Type::NORMAL; | 197 params.navigation_type = ViewMsg_Navigate_Type::NORMAL; |
197 params.request_time = base::Time::Now(); | 198 params.request_time = base::Time::Now(); |
198 channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params)); | 199 channel_->Send(new ViewMsg_Navigate(impl->routing_id(), params)); |
199 message_loop_.Run(); | 200 message_loop_.Run(); |
200 } | 201 } |
OLD | NEW |