Render process count should not be forced from java unconditionally

content/browser/android/content_startup_flags.cc

 // Copyright (c) 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/android/content_startup_flags.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/base/switches.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace content {
 
 void SetContentCommandLineFlags(int max_render_process_count,
                                 const std::string& plugin_descriptor) {
   // May be called multiple times, to cover all possible program entry points.
   static bool already_initialized = false;
   if (already_initialized)
     return;
   already_initialized = true;
 
   CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
 
+  int command_line_renderer_limit = -1;
   if (parsed_command_line->HasSwitch(switches::kRendererProcessLimit)) {
     std::string limit = parsed_command_line->GetSwitchValueASCII(
         switches::kRendererProcessLimit);
     int value;
-    if (base::StringToInt(limit, &value))
-      max_render_process_count = value;
+    if (base::StringToInt(limit, &value)) {
+      command_line_renderer_limit = value;
+      if (value <= 0)
+        max_render_process_count = 0;
+    }
   }
 
-  if (max_render_process_count <= 0) {
+  if (command_line_renderer_limit > 0) {
+    int limit = std::min(command_line_renderer_limit,
+                         static_cast<int>(kMaxRendererProcessCount));
+    RenderProcessHost::SetMaxRendererProcessCount(limit);
+  } else if (max_render_process_count <= 0) {
     // Need to ensure the command line flag is consistent as a lot of chrome
     // internal code checks this directly, but it wouldn't normally get set when
     // we are implementing an embedded WebView.
     parsed_command_line->AppendSwitch(switches::kSingleProcess);
   } else {
-    max_render_process_count =
-        std::min(max_render_process_count,
-                 static_cast<int>(content::kMaxRendererProcessCount));
-    content::RenderProcessHost::SetMaxRendererProcessCount(
-        max_render_process_count);
+    int default_maximum = RenderProcessHost::GetMaxRendererProcessCount();
+    DCHECK(default_maximum <= static_cast<int>(kMaxRendererProcessCount));
+    if (max_render_process_count < default_maximum)
+      RenderProcessHost::SetMaxRendererProcessCount(max_render_process_count);
   }
 
   parsed_command_line->AppendSwitch(switches::kForceCompositingMode);
   parsed_command_line->AppendSwitch(switches::kAllowWebUICompositing);
   parsed_command_line->AppendSwitch(switches::kEnableThreadedCompositing);
   parsed_command_line->AppendSwitch(
       switches::kEnableCompositingForFixedPosition);
   parsed_command_line->AppendSwitch(switches::kEnableAcceleratedOverflowScroll);
   parsed_command_line->AppendSwitch(
       switches::kEnableAcceleratedScrollableFrames);
@@ skipping 33 matching lines @@
   }
 
   // Disable profiler timing by default.
   if (!parsed_command_line->HasSwitch(switches::kProfilerTiming)) {
     parsed_command_line->AppendSwitchASCII(
         switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
   }
 }
 
 }  // namespace content