PPAPI: Refactor renderer side of browser host creation

content/renderer/pepper/pepper_file_chooser_host.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/pepper_file_chooser_host.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
@@ skipping 148 matching lines @@
     return PP_ERROR_NOACCESS;
   }
 
   reply_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PepperFileChooserHost::DidCreateResourceHosts(
     const std::vector<base::FilePath>& file_paths,
     const std::vector<std::string>& display_names,
-    const std::vector<int>& browser_ids) {
-  DCHECK(file_paths.size() == display_names.size());
-  DCHECK(file_paths.size() == browser_ids.size());
+    const ppapi::proxy::CompletedBrowserResourceHosts& browser_hosts) {
+  DCHECK_EQ(file_paths.size(), display_names.size());
+  DCHECK_EQ(file_paths.size(), browser_hosts.host_ids.size());
 
   std::vector<ppapi::FileRefCreateInfo> chosen_files;
-  for (size_t i = 0; i < browser_ids.size(); ++i) {
+  for (size_t i = 0; i < browser_hosts.host_ids.size(); ++i) {
     PepperFileRefRendererHost* renderer_host = new PepperFileRefRendererHost(
         renderer_ppapi_host_, pp_instance(), 0, file_paths[i]);
     int renderer_id =
         renderer_ppapi_host_->GetPpapiHost()->AddPendingResourceHost(
             scoped_ptr<ppapi::host::ResourceHost>(renderer_host));
     ppapi::FileRefCreateInfo info = ppapi::MakeExternalFileRefCreateInfo(
-        file_paths[i], display_names[i], browser_ids[i], renderer_id);
+        file_paths[i],
+        display_names[i],
+        browser_hosts.host_ids[i],
+        renderer_id);
     chosen_files.push_back(info);
   }
 
   reply_context_.params.set_result(PP_OK);
   host()->SendReply(reply_context_,
                     PpapiPluginMsg_FileChooser_ShowReply(chosen_files));
   reply_context_ = ppapi::host::ReplyMessageContext();
   handler_ = NULL;  // Handler deletes itself.
 }
 
 }  // namespace content