summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 01:26:14 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 01:26:14 +0000
commit458dd03a5ac1e4923323116bcb3082caadeead56 (patch)
tree8a3d631eefc0e5e336d44bff4ed7242bd0ccb74f /content/test
parent109e3d1003a81387c2abef49564afffe4bbe671d (diff)
downloadchromium_src-458dd03a5ac1e4923323116bcb3082caadeead56.zip
chromium_src-458dd03a5ac1e4923323116bcb3082caadeead56.tar.gz
chromium_src-458dd03a5ac1e4923323116bcb3082caadeead56.tar.bz2
Keep a copy of page id in RenderViewHost.
Also, ensure that it stays in sync with the renderer's copy. BUG=99379,369661 TEST=no CHECKs hit in the wild, all tests stay green Review URL: https://codereview.chromium.org/423393008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/test_render_view_host.cc4
-rw-r--r--content/test/test_render_view_host.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 6a1177d..3573a1f 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -345,9 +345,9 @@ void TestRenderViewHost::TestOnStartDragging(
}
void TestRenderViewHost::TestOnUpdateStateWithFile(
- int process_id,
+ int page_id,
const base::FilePath& file_path) {
- OnUpdateState(process_id,
+ OnUpdateState(page_id,
PageState::CreateForTesting(GURL("http://www.google.com"),
false,
"data",
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 5dd8a94..3a48ec7 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -251,7 +251,7 @@ class TestRenderViewHost
FrameHostMsg_DidCommitProvisionalLoad_Params* params);
void TestOnUpdateStateWithFile(
- int process_id, const base::FilePath& file_path);
+ int page_id, const base::FilePath& file_path);
void TestOnStartDragging(const DropData& drop_data);