Support startup performance tests on Galaxy S3

build/android/pylib/flag_changer.py

 # 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.
 
 import constants
 import traceback
 import warnings
 
 
 # Location where chrome reads command line flags from
@@ skipping 71 matching lines @@
   def Restore(self):
     """Restores the flags to their original state."""
     self._current_flags = self._TokenizeFlags(self._orig_line)
     self._UpdateCommandLineFile()
 
   def _UpdateCommandLineFile(self):
     """Writes out the command line to the file, or removes it if empty."""
     print "Current flags: ", self._current_flags
 
     if self._current_flags:
-      self._android_cmd.SetFileContents(CHROME_COMMAND_FILE,
-                                        'chrome ' +
-                                        ' '.join(self._current_flags))
+      # Can't use SetFileContents since that uses push, which doesn't work
+      # on user type builds for protected files.
+      self._android_cmd.RunShellCommand(

[bulach, 2013/01/14 17:26:50]

nit: the escaping makes it hard to read :)
how about SetFileContents to somewhere public in $STORAGE_CARD, then use 
"su cp SRC TARGET"

[aberent, 2013/01/14 20:19:10]

It didn't work anyway, once I retested it, so that is what I am ending up with.
I don't know how it worked first time.
See my next patch.

+          'su -c echo \"' + 'chrome ' + ' '.join(self._current_flags) +
+          ' > ' + CHROME_COMMAND_FILE + '\"')
     else:
-      self._android_cmd.RunShellCommand('rm ' + CHROME_COMMAND_FILE)
+      self._android_cmd.RunShellCommand('su -c rm ' + CHROME_COMMAND_FILE)
 
   def _TokenizeFlags(self, line):
     """Changes the string containing the command line into a list of flags.
 
     Follows similar logic to CommandLine.java::tokenizeQuotedArguments:
     * Flags are split using whitespace, unless the whitespace is within a
       pair of quotation marks.
     * Unlike the Java version, we keep the quotation marks around switch
       values since we need them to re-create the file when new flags are
       appended.
@@ skipping 28 matching lines @@
 
     # Tack on the last flag.
     if not current_flag:
       if within_quotations:
         warnings.warn("Unterminated quoted string: " + current_flag)
     else:
       tokenized_flags.append(current_flag)
 
     # Return everything but the program name.
     return tokenized_flags[1:]