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/browser/renderer_host/test_backing_store.h" | 5 #include "content/browser/renderer_host/test_backing_store.h" |
6 #include "content/browser/renderer_host/test_render_view_host.h" | 6 #include "content/browser/renderer_host/test_render_view_host.h" |
7 #include "content/browser/site_instance_impl.h" | 7 #include "content/browser/site_instance_impl.h" |
8 #include "content/browser/web_contents/navigation_controller_impl.h" | 8 #include "content/browser/web_contents/navigation_controller_impl.h" |
9 #include "content/browser/web_contents/test_web_contents.h" | 9 #include "content/browser/web_contents/test_web_contents.h" |
10 #include "content/common/view_messages.h" | 10 #include "content/common/view_messages.h" |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 TestRenderViewHost::~TestRenderViewHost() { | 225 TestRenderViewHost::~TestRenderViewHost() { |
226 if (delete_counter_) | 226 if (delete_counter_) |
227 ++*delete_counter_; | 227 ++*delete_counter_; |
228 | 228 |
229 // Since this isn't a traditional view, we have to delete it. | 229 // Since this isn't a traditional view, we have to delete it. |
230 delete GetView(); | 230 delete GetView(); |
231 } | 231 } |
232 | 232 |
233 bool TestRenderViewHost::CreateRenderView(const string16& frame_name, | 233 bool TestRenderViewHost::CreateRenderView(const string16& frame_name, |
234 int opener_route_id, | 234 int opener_route_id, |
235 int32 max_page_id) { | 235 int32 max_page_id, |
| 236 int embedder_process_id) { |
236 DCHECK(!render_view_created_); | 237 DCHECK(!render_view_created_); |
237 render_view_created_ = true; | 238 render_view_created_ = true; |
238 return true; | 239 return true; |
239 } | 240 } |
240 | 241 |
241 bool TestRenderViewHost::IsRenderViewLive() const { | 242 bool TestRenderViewHost::IsRenderViewLive() const { |
242 return render_view_created_; | 243 return render_view_created_; |
243 } | 244 } |
244 | 245 |
245 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { | 246 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 | 321 |
321 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { | 322 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { |
322 return static_cast<TestRenderViewHost*>(active_rvh()); | 323 return static_cast<TestRenderViewHost*>(active_rvh()); |
323 } | 324 } |
324 | 325 |
325 TestWebContents* RenderViewHostImplTestHarness::contents() { | 326 TestWebContents* RenderViewHostImplTestHarness::contents() { |
326 return static_cast<TestWebContents*>(web_contents()); | 327 return static_cast<TestWebContents*>(web_contents()); |
327 } | 328 } |
328 | 329 |
329 } // namespace content | 330 } // namespace content |
OLD | NEW |