Simplifying ContentBrowserClient::GetAdditionalMappedFiles...()

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index b5a10565cf4a67b0d50a860b0b9d8afa2462a980..66dc72442418e8667c74a80770e73ff38c88523a 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -475,18 +475,16 @@ content::TracingDelegate* AwContentBrowserClient::GetTracingDelegate() {
 void AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
       const base::CommandLine& command_line,
       int child_process_id,
-      content::FileDescriptorInfo* mappings,
-      std::map<int, base::MemoryMappedFile::Region>* regions) {
-  int fd = ui::GetMainAndroidPackFd(
-      &(*regions)[kAndroidWebViewMainPakDescriptor]);
-  mappings->Share(kAndroidWebViewMainPakDescriptor, fd);
-
-  fd = ui::GetCommonResourcesPackFd(
-      &(*regions)[kAndroidWebView100PercentPakDescriptor]);
-  mappings->Share(kAndroidWebView100PercentPakDescriptor, fd);
-
-  fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]);
-  mappings->Share(kAndroidWebViewLocalePakDescriptor, fd);
+      content::FileDescriptorInfo* mappings) {
+  base::MemoryMappedFile::Region region;
+  int fd = ui::GetMainAndroidPackFd(&region);
+  mappings->ShareWithRegion(kAndroidWebViewMainPakDescriptor, fd, region);
+
+  fd = ui::GetCommonResourcesPackFd(&region);
+  mappings->ShareWithRegion(kAndroidWebView100PercentPakDescriptor, fd, region);
+
+  fd = ui::GetLocalePackFd(&region);
+  mappings->ShareWithRegion(kAndroidWebViewLocalePakDescriptor, fd, region);
 
   base::ScopedFD crash_signal_file =
       breakpad::CrashMicroDumpManager::GetInstance()->CreateCrashInfoChannel(