Enable gesture events handling on Android.

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 445b04c0eb2135caefd4508256785c77df0c298b..e89f67f67afe343079870475f8d2c27118d84ba6 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -50,7 +50,7 @@ void SetContentCommandLineFlags(int max_render_process_count,
 
   CommandLine* parsed_command_line = CommandLine::ForCurrentProcess();
 
-#if !defined(ANDROID_UPSTREAM_BRINGUP)
+
   // TODO(yfriedman): Upstream this when bringing up rendering code and
   // rendering modes. b/6668088
   // Set subflags for the --graphics-mode=XYZ omnibus flag.
@@ -72,12 +72,14 @@ void SetContentCommandLineFlags(int max_render_process_count,
     SetCommandLineSwitch(switches::kEnableAcceleratedPlugins);
     SetCommandLineSwitch(switches::kEnableCompositingForFixedPosition);
     SetCommandLineSwitch(switches::kEnableThreadedCompositing);
+#if !defined(ANDROID_UPSTREAM_BRINGUP)
     // Per tile painting saves memory in background tabs (http://b/5669228).
     SetCommandLineSwitch(switches::kEnablePerTilePainting);

[aelias_OOO_until_Jul13, 2012/07/27 01:35:04]

Please remove the #if and make this exactly match the downstream version to
avoid merge conflicts.

+#endif
+
   } else {
     LOG(FATAL) << "Invalid --graphics-mode flag: " << graphics_mode;
   }
-#endif
 
   if (parsed_command_line->HasSwitch(switches::kRendererProcessLimit)) {
     std::string limit = parsed_command_line->GetSwitchValueASCII(