Clean up Android default command line flags.

content/browser/android/content_startup_flags.cc

Index: content/browser/android/content_startup_flags.cc
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index 1d4507514cba3d388fda84d86c27f30393efca94..c3faf9c3493e140c917c7193013d355184fac9b6 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -5,7 +5,6 @@
 #include "content/browser/android/content_startup_flags.h"
 
 #include "base/string_number_conversions.h"
-#include "base/string_split.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/public/browser/render_process_host.h"
@@ -13,72 +12,17 @@
 #include "content/public/common/content_switches.h"
 #include "ui/base/ui_base_switches.h"
 
-namespace {
-
-void SetCommandLineSwitch(const std::string& switch_string) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switch_string))
-    command_line->AppendSwitch(switch_string);
-}
-
-void SetPepperCommandLineFlags(std::string plugin_descriptor) {
-  CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
-
-  // Get the plugin info from the Java side. kRegisterPepperPlugins needs to be
-  // added to the CommandLine before either PluginService::GetInstance() or
-  // BrowserRenderProcessHost::AppendRendererCommandLine() is called to ensure
-  // the plugin is available.
-  // TODO(klobag) with the current implementation, the plugin can only be added
-  // in the process start up time. Need to look into whether we can add the
-  // plugin when the process is running.
-  if (!plugin_descriptor.empty()) {
-    parsed_command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
-                                            plugin_descriptor);
-  }
-}
-
-} // namespace
-
 namespace content {
 
-void SetContentCommandLineFlags(int max_render_process_count,
-                                const std::string& plugin_descriptor) {
+void SetContentCommandLineFlags(int max_render_process_count) {
   // May be called multiple times, to cover all possible program entry points.
   static bool already_initialized = false;
-  if (already_initialized) return;
+  if (already_initialized)
+    return;
   already_initialized = true;
 
   CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
 
-
-  // TODO(yfriedman): Upstream this when bringing up rendering code and
-  // rendering modes. b/6668088
-  // Set subflags for the --graphics-mode=XYZ omnibus flag.
-  std::string graphics_mode;
-  if (parsed_command_line->HasSwitch(switches::kGraphicsMode)) {
-    graphics_mode = parsed_command_line->GetSwitchValueASCII(
-        switches::kGraphicsMode);
-  } else {
-    // Default mode is threaded compositor mode
-    graphics_mode = switches::kGraphicsModeValueCompositor;
-    parsed_command_line->AppendSwitchNative(
-        switches::kGraphicsMode, graphics_mode.c_str());
-  }
-
-  if (graphics_mode == switches::kGraphicsModeValueBasic) {
-    // Intentionally blank.
-  } else if (graphics_mode == switches::kGraphicsModeValueCompositor) {
-    SetCommandLineSwitch(switches::kForceCompositingMode);
-    SetCommandLineSwitch(switches::kEnableAcceleratedPlugins);
-    SetCommandLineSwitch(switches::kEnableCompositingForFixedPosition);
-    SetCommandLineSwitch(switches::kEnableThreadedCompositing);
-    // Per tile painting saves memory in background tabs (http://b/5669228).
-    // ...but it now fails an SkAssert(), so disable it. b/6819634
-    // SetCommandLineSwitch(switches::kEnablePerTilePainting);
-  } else {
-    LOG(FATAL) << "Invalid --graphics-mode flag: " << graphics_mode;
-  }
-
   if (parsed_command_line->HasSwitch(switches::kRendererProcessLimit)) {
     std::string limit = parsed_command_line->GetSwitchValueASCII(
         switches::kRendererProcessLimit);
@@ -91,7 +35,7 @@ void SetContentCommandLineFlags(int max_render_process_count,
     // 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.
-    SetCommandLineSwitch(switches::kSingleProcess);
+    parsed_command_line->AppendSwitch(switches::kSingleProcess);
   } else {
     max_render_process_count =
         std::min(max_render_process_count,
@@ -100,9 +44,14 @@ void SetContentCommandLineFlags(int max_render_process_count,
         max_render_process_count);
   }
 
-  // Load plugins out-of-process by default.
-  // We always want flash out-of-process.
-  parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess);
+  parsed_command_line->AppendSwitch(switches::kForceCompositingMode);
+  parsed_command_line->AppendSwitch(switches::kEnableThreadedCompositing);
+  parsed_command_line->AppendSwitch(
+      switches::kEnableCompositingForFixedPosition);
+
+  parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight);
+  parsed_command_line->AppendSwitch(switches::kEnableTouchEvents);
+  parsed_command_line->AppendSwitch(switches::kEnablePinch);
 
   // Run the GPU service as a thread in the browser instead of as a
   // standalone process.
@@ -111,17 +60,6 @@ void SetContentCommandLineFlags(int max_render_process_count,
   // Always use fixed layout and viewport tag.
   parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
   parsed_command_line->AppendSwitch(switches::kEnableViewport);
-
-  // TODO(aelias): switch this to true value of deviceScaleFactor once floats
-  //               are supported
-  parsed_command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
-                                         "1");
-
-  // TODO(aelias): Enable these flags once they're merged in from upstream.
-  //  parsed_command_line->AppendSwitch(switches::kEnableTouchEvents);
-  //  parsed_command_line->AppendSwitch(switches::kEnablePinch);
-
-  SetPepperCommandLineFlags(plugin_descriptor);
 }
 
 }  // namespace content