Simplifying ContentBrowserClient::GetAdditionalMappedFiles...()

content/browser/child_process_launcher.cc

 // Copyright 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/browser/child_process_launcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 156 matching lines @@
   if (field_trial_handle != base::kInvalidPlatformFile)
     files_to_register->Share(kFieldTrialDescriptor, field_trial_handle);
 #if defined(OS_ANDROID)
   files_to_register->Share(kMojoIPCChannel, mojo_fd.get());
 #else
   files_to_register->Transfer(kMojoIPCChannel, std::move(mojo_fd));
 #endif
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   std::map<int, base::MemoryMappedFile::Region> regions;

[boliu, 2017/01/05 07:02:08]

seems incomplete this is still here and the regions from files_to_resgister is
ignored?

[Jay Civelli, 2017/01/05 17:12:18]

You are right. This is part of a bigger CL I am breaking down and forgot some
parts. Thanks for catching this.

   GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-      *cmd_line, child_process_id, files_to_register.get()
-#if defined(OS_ANDROID)
-      , &regions
-#endif
-      );
+      *cmd_line, child_process_id, files_to_register.get());
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
   bool snapshot_loaded = false;
 #if defined(OS_ANDROID)
   base::MemoryMappedFile::Region region;
   auto maybe_register = [&region, &regions, &files_to_register](int key,
                                                                 int fd) {
     if (fd != -1) {
       files_to_register->Share(key, fd);
       regions.insert(std::make_pair(key, region));
     }
@@ skipping 411 matching lines @@
 }
 
 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
     Client* client) {
   Client* ret = client_;
   client_ = client;
   return ret;
 }
 
 }  // namespace content