Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/security_exploit_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
 #include "content/browser/frame_host/navigator.h"
@@ skipping 218 matching lines @@
                        AttemptDuplicateRenderWidgetHost) {
   int duplicate_routing_id = MSG_ROUTING_NONE;
   RenderViewHostImpl* pending_rvh =
       PrepareToDuplicateHosts(shell(), &duplicate_routing_id);
   EXPECT_NE(MSG_ROUTING_NONE, duplicate_routing_id);
 
   // Since this test executes on the UI thread and hopping threads might cause
   // different timing in the test, let's simulate a CreateNewWidget call coming
   // from the IO thread.  Use the existing window routing id to cause a
   // deliberate collision.
-  pending_rvh->CreateNewWidget(duplicate_routing_id, 0 /* surface_id */,
-                               blink::WebPopupTypePage);
+  pending_rvh->CreateNewWidget(duplicate_routing_id, blink::WebPopupTypePage);
 
   // If the above operation doesn't crash, the test has succeeded!
 }
 
 // This is a test for crbug.com/444198. It tries to send a
 // ViewHostMsg_RunFileChooser containing an invalid path. The browser should
 // correctly terminate the renderer in these cases.
 IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, AttemptRunFileChoosers) {
   TestFileChooserWithPath(base::FilePath(FILE_PATH_LITERAL("../../*.txt")));
   TestFileChooserWithPath(base::FilePath(FILE_PATH_LITERAL("/etc/*.conf")));
@@ skipping 177 matching lines @@
         RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
     IPC::IpcSecurityTestUtil::PwnMessageReceived(
         web_rfh->GetProcess()->GetChannel(),
         ResourceHostMsg_RequestResource(web_rfh->GetRoutingID(), 1,
                                         invalid_scheme_origin_msg));
     web_process_killed.Wait();
   }
 }
 
 }  // namespace content