Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: content/browser/child_process_launcher.cc

Issue 2793623002: android: Limit num renderer to service slots (Closed)
Patch Set: fix remaining unit tests Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/child_process_launcher.h" 5 #include "content/browser/child_process_launcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/i18n/icu_util.h" 10 #include "base/i18n/icu_util.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 catalog::RequiredFileMap required_files) { 156 catalog::RequiredFileMap required_files) {
157 ChildProcessLauncherHelper::SetRegisteredFilesForService( 157 ChildProcessLauncherHelper::SetRegisteredFilesForService(
158 service_name, std::move(required_files)); 158 service_name, std::move(required_files));
159 } 159 }
160 160
161 // static 161 // static
162 void ChildProcessLauncher::ResetRegisteredFilesForTesting() { 162 void ChildProcessLauncher::ResetRegisteredFilesForTesting() {
163 ChildProcessLauncherHelper::ResetRegisteredFilesForTesting(); 163 ChildProcessLauncherHelper::ResetRegisteredFilesForTesting();
164 } 164 }
165 165
166 #if defined(OS_ANDROID)
167 // static
168 size_t ChildProcessLauncher::GetNumberOfRendererSlots() {
169 return ChildProcessLauncherHelper::GetNumberOfRendererSlots();
170 }
171 #endif // OS_ANDROID
172
166 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest( 173 ChildProcessLauncher::Client* ChildProcessLauncher::ReplaceClientForTest(
167 Client* client) { 174 Client* client) {
168 Client* ret = client_; 175 Client* ret = client_;
169 client_ = client; 176 client_ = client;
170 return ret; 177 return ret;
171 } 178 }
172 179
173 } // namespace content 180 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698