Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be

8 files changed, 29 insertions, 15 deletions

diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index cb72fffba5..f8c074758d 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -350,6 +350,11 @@ class AndroidCommands(object):
     if full_reboot or not self.IsRootEnabled():
       self._adb.SendCommand('reboot')
       timeout = 300
+      retries = 1
+      # Wait for the device to disappear.
+      while retries < 10 and self.IsOnline():
+        time.sleep(1)
+        retries += 1
     else:
       self.RestartShell()
       timeout = 120
diff --git a/build/android/pylib/gtest/test_package_apk.py b/build/android/pylib/gtest/test_package_apk.py
index 84dd7bd8e7..7fb55f63a4 100644
--- a/build/android/pylib/gtest/test_package_apk.py
+++ b/build/android/pylib/gtest/test_package_apk.py
@@ -87,6 +87,12 @@ class TestPackageApk(TestPackage):
   #override
   def ClearApplicationState(self, adb):
     adb.ClearApplicationState(self._test_apk_package_name)
+    # Content shell creates a profile on the sdscard which accumulates cache
+    # files over time.
+    if self.suite_name == 'content_browsertests':
+      adb.RunShellCommand(
+          'rm -r %s/content_shell' % adb.GetExternalStorage(),
+          timeout_time=60 * 2)
 
   #override
   def CreateCommandLineFileOnDevice(self, adb, test_filter, test_arguments):
diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
index 70d393c9ab..8db2f83450 100644
--- a/build/android/pylib/gtest/test_runner.py
+++ b/build/android/pylib/gtest/test_runner.py
@@ -188,10 +188,6 @@ class TestRunner(base_test_runner.BaseTestRunner):
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
-    # Content shell creates a profile on the sdscard which accumulates cache
-    # files over time.
-    self.adb.RunShellCommand('rm -r ' +
-        os.path.join(self.adb.GetExternalStorage(), 'content_shell'),
-        timeout_time=60 * 2)
+    self.test_package.ClearApplicationState(self.adb)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index acee213847..705eec41f3 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -542,7 +542,7 @@ def _RunMonkeyTests(options, error_func):
   runner_factory, tests = monkey_setup.Setup(monkey_options)
 
   results, exit_code = test_dispatcher.RunTests(
-      tests, runner_factory, False, None, shard=False)
+      tests, runner_factory, False, None, shard=False, test_timeout=None)
 
   report_results.LogFull(
       results=results,
diff --git a/build/common.gypi b/build/common.gypi
index 158995598c..e95efab421 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -343,7 +343,11 @@
       # Enable Google Now.
       'enable_google_now%': 1,
 
-      # Enable printing support and UI.
+      # Enable printing support and UI. This variable is used to configure
+      # which parts of printing will be built. 0 disables printing completely,
+      # 1 enables it fully, and 2 enables only the codepath to generate a
+      # Metafile (e.g. usually a PDF or EMF) and disables print preview, cloud
+      # print, UI, etc.
       'enable_printing%': 1,
 
       # Enable spell checker.
@@ -1119,6 +1123,9 @@
     # Turns on the i18n support in V8.
     'v8_enable_i18n_support': 1,
 
+    # Use the chromium skia by default.
+    'use_system_skia%': '0',
+
     'conditions': [
       # The version of GCC in use, set later in platforms that use GCC and have
       # not explicitly chosen to build with clang. Currently, this means all
@@ -1332,9 +1339,6 @@
         # Uses system APIs for decoding audio and video.
         'use_libffmpeg%': '0',
 
-        # Always use the chromium skia.
-        'use_system_skia%': '0',
-
         # When building as part of the Android system, use system libraries
         # where possible to reduce ROM size.
         # TODO(steveblock): Investigate using the system version of sqlite.
@@ -1584,7 +1588,7 @@
       ['enable_extensions==1', {
         'grit_defines': ['-D', 'enable_extensions'],
       }],
-      ['enable_printing==1', {
+      ['enable_printing!=0', {
         'grit_defines': ['-D', 'enable_printing'],
       }],
       ['enable_themes==1', {
@@ -2261,6 +2265,9 @@
         'defines': ['ENABLE_GOOGLE_NOW=1'],
       }],
       ['enable_printing==1', {
+        'defines': ['ENABLE_FULL_PRINTING=1', 'ENABLE_PRINTING=1'],
+      }],
+      ['enable_printing==2', {
         'defines': ['ENABLE_PRINTING=1'],
       }],
       ['enable_spellcheck==1', {
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index ed15d463a1..c72022c6d2 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -565,6 +565,8 @@ IDS_FLAGS_ENABLE_PASSWORD_GENERATION_DESCRIPTION
 IDS_FLAGS_ENABLE_PASSWORD_GENERATION_NAME
 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION
 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME
+IDS_FLAGS_ENABLE_PNACL_DESCRIPTION
+IDS_FLAGS_ENABLE_PNACL_NAME
 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION
 IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME
 IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION
@@ -670,8 +672,6 @@ IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_DESCRIPTION
 IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_NAME
 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION
 IDS_FLAGS_PER_TILE_PAINTING_NAME
-IDS_FLAGS_PNACL_DESCRIPTION
-IDS_FLAGS_PNACL_NAME
 IDS_FLAGS_PRESENT_WITH_GDI_ALL_SHOW
 IDS_FLAGS_PRESENT_WITH_GDI_DESCRIPTION
 IDS_FLAGS_PRESENT_WITH_GDI_FIRST_SHOW
diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE
index 63a3a52e58..0ef7af5e43 100644
--- a/build/util/LASTCHANGE
+++ b/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=216972
+LASTCHANGE=217147
diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink
index aa8f059de6..2b4cc5ae4d 100644
--- a/build/util/LASTCHANGE.blink
+++ b/build/util/LASTCHANGE.blink
@@ -1 +1 @@
-LASTCHANGE=155921
+LASTCHANGE=155942