Make new-style page scale work 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 3e0ee61af2a669a87247093f83b65e7f94af0c20..e7932046d70913a8a9a535a7fe9e43670b10851d 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -57,7 +57,9 @@ void SetContentCommandLineFlags(int max_render_process_count) {
       switches::kEnableCompositedScrollingForFrames);
 
   parsed_command_line->AppendSwitch(switches::kEnableGestureTapHighlight);
-  parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch);
+  parsed_command_line->AppendSwitch(switches::kEnablePinch);

[no sievers, 2013/01/18 00:21:19]

kEnablePinch would not conflict with kEnableCssTransformPinch anywhere?

[aelias_OOO_until_Jul13, 2013/01/18 00:33:37]

Should be fine.  kEnablePinch turns on some pinch-specific codepaths, whereas
kEnableCssTransformPinch changes the coordinate space.  It's safer to have
kEnablePinch in case some code we use is hidden behind it.

+  if (!parsed_command_line->HasSwitch(cc::switches::kEnableImplSidePainting))
+    parsed_command_line->AppendSwitch(switches::kEnableCssTransformPinch);
 
   // Run the GPU service as a thread in the browser instead of as a
   // standalone process.