diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 6fc464fe7f24..b0a7e72b5f24 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -137,10 +137,6 @@ BrowserMainParts::~BrowserMainParts() { } void BrowserMainParts::PreEarlyInitialization() { -#if defined(OS_MACOSX) - IncreaseFileDescriptorLimit(); -#endif - #if defined(USE_X11) views::LinuxUI::SetInstance(BuildGtk2UI()); OverrideLinuxAppDataPath(); diff --git a/brightray/browser/browser_main_parts.h b/brightray/browser/browser_main_parts.h index da35d78c2292..5b50516f7cc2 100644 --- a/brightray/browser/browser_main_parts.h +++ b/brightray/browser/browser_main_parts.h @@ -49,7 +49,6 @@ class BrowserMainParts : public content::BrowserMainParts { private: #if defined(OS_MACOSX) - void IncreaseFileDescriptorLimit(); void InitializeMainNib(); #endif diff --git a/brightray/browser/browser_main_parts_mac.mm b/brightray/browser/browser_main_parts_mac.mm index a795e80a69d4..19d0262a101f 100644 --- a/brightray/browser/browser_main_parts_mac.mm +++ b/brightray/browser/browser_main_parts_mac.mm @@ -6,35 +6,6 @@ namespace brightray { -namespace { - -// Sets the file descriptor soft limit to |max_descriptors| or the OS hard limit, whichever is -// lower. -void SetFileDescriptorLimit(rlim_t max_descriptors) { - rlimit limits; - if (getrlimit(RLIMIT_NOFILE, &limits) != 0) { - PLOG(INFO) << "Failed to get file descriptor limit"; - return; - } - - auto new_limit = max_descriptors; - if (limits.rlim_max > 0) - new_limit = std::min(new_limit, limits.rlim_max); - limits.rlim_cur = new_limit; - if (setrlimit(RLIMIT_NOFILE, &limits) != 0) - PLOG(INFO) << "Failed to set file descriptor limit"; -} - -} // namespace - -void BrowserMainParts::IncreaseFileDescriptorLimit() { - // We use quite a few file descriptors for our IPC, and the default limit on the Mac is low (256), - // so bump it up. - // See http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/chrome_browser_main_posix.cc?revision=244734#l295 - // and https://codereview.chromium.org/125151 - SetFileDescriptorLimit(1024); -} - // Replicates NSApplicationMain, but doesn't start a run loop. void BrowserMainParts::InitializeMainNib() { auto infoDictionary = base::mac::OuterBundle().infoDictionary;