Index: chrome/browser/chrome_content_browser_client.h |
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h |
index a58d4684cf06f8f73238d73e8a441fa2c48a350c..389e88327ab44578b6e040744c6897d2d2d48237 100644 |
--- a/chrome/browser/chrome_content_browser_client.h |
+++ b/chrome/browser/chrome_content_browser_client.h |
@@ -259,18 +259,12 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { |
content::RenderFrameHost* render_frame_host, |
blink::WebPageVisibilityState* visibility_state) override; |
-#if defined(OS_ANDROID) |
- void GetAdditionalMappedFilesForChildProcess( |
- const base::CommandLine& command_line, |
- int child_process_id, |
- content::FileDescriptorInfo* mappings, |
- std::map<int, base::MemoryMappedFile::Region>* regions) override; |
-#elif defined(OS_POSIX) && !defined(OS_MACOSX) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) |
void GetAdditionalMappedFilesForChildProcess( |
const base::CommandLine& command_line, |
int child_process_id, |
content::FileDescriptorInfo* mappings) override; |
-#endif // defined(OS_ANDROID) |
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
#if defined(OS_WIN) |
bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; |
base::string16 GetAppContainerSidForSandboxType( |