| Index: content/browser/security_exploit_browsertest.cc
|
| diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
|
| index 5f51e86ef88506cc0d4d1522a63dc1993bfeb625..4b0ff5288dae24c530603e3027181024c913cc34 100644
|
| --- a/content/browser/security_exploit_browsertest.cc
|
| +++ b/content/browser/security_exploit_browsertest.cc
|
| @@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, SetWebUIProperty) {
|
| // process.
|
| IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
| AttemptDuplicateRenderViewHost) {
|
| - int duplicate_routing_id = MSG_ROUTING_NONE;
|
| + int32 duplicate_routing_id = MSG_ROUTING_NONE;
|
| RenderViewHostImpl* pending_rvh =
|
| PrepareToDuplicateHosts(shell(), &duplicate_routing_id);
|
| EXPECT_NE(MSG_ROUTING_NONE, duplicate_routing_id);
|
| @@ -213,10 +213,10 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
| scoped_refptr<SessionStorageNamespaceImpl> session_storage(
|
| new SessionStorageNamespaceImpl(dom_storage_context));
|
| // Cause a deliberate collision in routing ids.
|
| - int main_frame_routing_id = duplicate_routing_id + 1;
|
| - pending_rvh->CreateNewWindow(duplicate_routing_id,
|
| - main_frame_routing_id,
|
| - params,
|
| + int32 main_frame_routing_id = duplicate_routing_id + 1;
|
| + int32 main_frame_widget_routing_id = duplicate_routing_id + 2;
|
| + pending_rvh->CreateNewWindow(duplicate_routing_id, main_frame_routing_id,
|
| + main_frame_widget_routing_id, params,
|
| session_storage.get());
|
|
|
| // If the above operation doesn't cause a crash, the test has succeeded!
|
|
|