Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1278)

Side by Side Diff: content/test/test_render_view_host.cc

Issue 526493004: Revert of Keep a copy of page id in RenderViewHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/test/test_render_view_host.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 void TestRenderViewHost::TestOnStartDragging( 340 void TestRenderViewHost::TestOnStartDragging(
341 const DropData& drop_data) { 341 const DropData& drop_data) {
342 blink::WebDragOperationsMask drag_operation = blink::WebDragOperationEvery; 342 blink::WebDragOperationsMask drag_operation = blink::WebDragOperationEvery;
343 DragEventSourceInfo event_info; 343 DragEventSourceInfo event_info;
344 OnStartDragging(drop_data, drag_operation, SkBitmap(), gfx::Vector2d(), 344 OnStartDragging(drop_data, drag_operation, SkBitmap(), gfx::Vector2d(),
345 event_info); 345 event_info);
346 } 346 }
347 347
348 void TestRenderViewHost::TestOnUpdateStateWithFile( 348 void TestRenderViewHost::TestOnUpdateStateWithFile(
349 int page_id, 349 int process_id,
350 const base::FilePath& file_path) { 350 const base::FilePath& file_path) {
351 OnUpdateState(page_id, 351 OnUpdateState(process_id,
352 PageState::CreateForTesting(GURL("http://www.google.com"), 352 PageState::CreateForTesting(GURL("http://www.google.com"),
353 false, 353 false,
354 "data", 354 "data",
355 &file_path)); 355 &file_path));
356 } 356 }
357 357
358 void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) { 358 void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) {
359 simulate_fetch_via_proxy_ = proxy; 359 simulate_fetch_via_proxy_ = proxy;
360 } 360 }
361 361
(...skipping 28 matching lines...) Expand all
390 390
391 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { 391 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
392 return contents()->GetMainFrame(); 392 return contents()->GetMainFrame();
393 } 393 }
394 394
395 TestWebContents* RenderViewHostImplTestHarness::contents() { 395 TestWebContents* RenderViewHostImplTestHarness::contents() {
396 return static_cast<TestWebContents*>(web_contents()); 396 return static_cast<TestWebContents*>(web_contents());
397 } 397 }
398 398
399 } // namespace content 399 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698