Android: Fix one issue for instrumentation on "user" devices.

build/android/pylib/run_java_tests.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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import fnmatch
 import logging
 import os
 import re
@@ skipping 230 matching lines @@
                                    'out_screenshots')
     if not os.path.exists(screenshot_path):
       os.mkdir(screenshot_path)
     screenshot_name = os.path.join(screenshot_path, test + '.png')
     logging.info('Taking screenshot named %s', screenshot_name)
     cmd_helper.RunCmd([screenshot_tool, '-s', self.device, screenshot_name])
 
   def SetUp(self):
     """Sets up the test harness and device before all tests are run."""
     super(TestRunner, self).SetUp()
-    if self.adb.SetJavaAssertsEnabled(enable=True):
-      self.adb.Reboot(full_reboot=False)
+    if not self.adb.IsRootEnabled():
+      logging.warning('Unable to enable java asserts for %s, non rooted device',
+                      self.device)
+    else:
+      if self.adb.SetJavaAssertsEnabled(enable=True):
+        self.adb.Reboot(full_reboot=False)
 
     # We give different default value to launch HTTP server based on shard index
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
     # This line *must* come before the forwarding below, as it nukes all
     # the other forwarders. A more comprehensive fix might be to pull the
     # forwarder-killing line up to here, but that might violate assumptions
     # implicit in other places.
     self.LaunchTestHttpServer(os.path.join(constants.CHROME_DIR),
                               (constants.LIGHTTPD_RANDOM_PORT_FIRST +
@@ skipping 318 matching lines @@
   if (len(attached_devices) > 1 and
       not coverage and
       not options.wait_for_debugger):
     sharder = TestSharder(attached_devices, options, tests, apks)
     test_results = sharder.RunShardedTests()
   else:
     runner = TestRunner(options, attached_devices[0], tests, coverage, 0, apks,
                         [])
     test_results = runner.Run()
   return test_results