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/test_render_view_host.h" | 5 #include "content/test/test_render_view_host.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 } | 235 } |
236 | 236 |
237 TestRenderViewHost::~TestRenderViewHost() { | 237 TestRenderViewHost::~TestRenderViewHost() { |
238 if (delete_counter_) | 238 if (delete_counter_) |
239 ++*delete_counter_; | 239 ++*delete_counter_; |
240 } | 240 } |
241 | 241 |
242 bool TestRenderViewHost::CreateRenderView( | 242 bool TestRenderViewHost::CreateRenderView( |
243 const base::string16& frame_name, | 243 const base::string16& frame_name, |
244 int opener_route_id, | 244 int opener_route_id, |
| 245 int proxy_routing_id, |
245 int32 max_page_id, | 246 int32 max_page_id, |
246 bool window_was_created_with_opener) { | 247 bool window_was_created_with_opener) { |
247 DCHECK(!render_view_created_); | 248 DCHECK(!render_view_created_); |
248 render_view_created_ = true; | 249 render_view_created_ = true; |
249 opener_route_id_ = opener_route_id; | 250 opener_route_id_ = opener_route_id; |
250 return true; | 251 return true; |
251 } | 252 } |
252 | 253 |
253 bool TestRenderViewHost::IsRenderViewLive() const { | 254 bool TestRenderViewHost::IsRenderViewLive() const { |
254 return render_view_created_; | 255 return render_view_created_; |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 | 390 |
390 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { | 391 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { |
391 return static_cast<TestRenderFrameHost*>(main_rfh()); | 392 return static_cast<TestRenderFrameHost*>(main_rfh()); |
392 } | 393 } |
393 | 394 |
394 TestWebContents* RenderViewHostImplTestHarness::contents() { | 395 TestWebContents* RenderViewHostImplTestHarness::contents() { |
395 return static_cast<TestWebContents*>(web_contents()); | 396 return static_cast<TestWebContents*>(web_contents()); |
396 } | 397 } |
397 | 398 |
398 } // namespace content | 399 } // namespace content |
OLD | NEW |