Tracing: fix error checking from deflate() when compressing trace

Initially broken by https://codereview.chromium.org/2150783002

BUG=629530,630030

Review-Url: https://codereview.chromium.org/2193323002
Cr-Commit-Position: refs/heads/master@{#408806}

content/browser/tracing/tracing_controller_impl_data_sinks.cc

@@ -252,7 +252,8 @@ class CompressedTraceDataEndpoint : public TraceDataEndpoint {
       stream_->avail_out = kChunkSize;
       stream_->next_out = (unsigned char*)buffer;
       err = deflate(stream_.get(), finished ? Z_FINISH : Z_NO_FLUSH);
-      if (err != (finished ? Z_STREAM_END : Z_OK)) {
+      if (err != Z_OK && (!finished || err != Z_STREAM_END)) {
+        LOG(ERROR) << "Deflate stream error: " << err;
         stream_.reset();
         return;
       }

tools/perf/core/about_tracing_integration_test.py

@@ -8,8 +8,7 @@ from telemetry.testing import tab_test_case
 class AboutTracingIntegrationTest(tab_test_case.TabTestCase):
 
   @decorators.Disabled('android',
-                       'mac',  # Flaky, see crbug.com/632238.
-                       'win')  # crbug.com/630030
+                       'win')  # https://crbug.com/632871
   def testBasicTraceRecording(self):
     action_runner = self._tab.action_runner
     action_runner.Navigate('chrome://tracing')

tools/valgrind/gtest_exclude/browser_tests.gtest-drmemory.txt

@@ -159,6 +159,3 @@ AppViewTests/AppViewTest.KillGuestCommunicatingWithWrongAppView/*
 
 # https://crbug.com/620370
 MdSettingsUITest.BackForwardDoesntCrash
-
-# https://crbug.com/629530
-BackgroundTracingManagerBrowserTest.CrashWhenSubprocessWithoutArgumentFilter