Revert "performance_browser_tests: Stabilize around AV-sync, run with AudioService." Bug 951084

This reverts commit 9abefd14.

Reason for revert: This CL has been identified as causing a breakage when merging coverage data for instrumented browser_tests. This is currently blocking a P0

Original change's description:
> performance_browser_tests: Stabilize around AV-sync, run with AudioService.
>
> Ensures that the separate, sandboxed Audio Service process is being used
> when the tests are run. Also, prevents tests from failing due to recent
> breakage of AV-sync measurement methodology (fix is being researched).
>
> Bug: 940087
> Change-Id: I0d7189ba9ce0d03bc8401a636085b4cc0f779920
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1555713
> Auto-Submit: Yuri Wiitala <miu@chromium.org>
> Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
> Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#648503}

TBR=miu@chromium.org,crouleau@chromium.org,rkc@chromium.org,sajjadm@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 940087
Change-Id: I3655a0031f3fe1d12f4f4a23fa73cd4a5abefc1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562306
Commit-Queue: Roberto Carrillo <robertocn@chromium.org>
Reviewed-by: Rahul Chaturvedi <rkc@chromium.org>
Reviewed-by: Roberto Carrillo <robertocn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649681}

chrome/browser/extensions/api/cast_streaming/performance_test.cc

@@ -67,13 +67,13 @@ constexpr int kMinDataPointsForQuickRun = 3;
 // long enough to collect sufficient tracing data; and, unfortunately, there's
 // nothing we can do about that.
 #define EXPECT_FOR_PERFORMANCE_RUN(expr)             \
-  if (!(expr)) {                                     \
+  do {                                               \
     if (is_full_performance_run()) {                 \
-      LOG(ERROR) << "Failure: " << #expr;            \
-    } else {                                         \
+      EXPECT_TRUE(expr);                             \
+    } else if (!(expr)) {                            \
       LOG(WARNING) << "Allowing failure: " << #expr; \
     }                                                \
-  }
+  } while (false)
 
 enum TestFlags {
   kSmallWindow = 1 << 2,      // Window size: 1 = 800x600, 0 = 2000x1000
@@ -168,7 +168,7 @@ class MeanAndError {
              const std::string& modifier,
              const std::string& trace,
              const std::string& unit) {
-    if (num_values_ > 0) {
+    if (num_values_ >= 20) {
       perf_test::PrintResultMeanAndError(measurement,
                                          modifier,
                                          trace,
@@ -176,7 +176,8 @@ class MeanAndError {
                                          unit,
                                          true);
     } else {
-      LOG(ERROR) << "No events for " << measurement << modifier << " " << trace;
+      LOG(ERROR) << "Not enough events (" << num_values_ << ") for "
+                 << measurement << modifier << " " << trace;
     }
   }
 

chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.cc

@@ -22,7 +22,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ -33,7 +32,6 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
-#include "services/service_manager/sandbox/features.h"
 #include "third_party/zlib/google/compression_utils.h"
 #include "ui/gl/gl_switches.h"
 
@@ -49,15 +47,6 @@ void TabCapturePerformanceTestBase::SetUp() {
   // Because screen capture is involved, require pixel output.
   EnablePixelOutput();
 
-  feature_list_.InitWithFeatures(
-      {
-          service_manager::features::kAudioServiceSandbox,
-          features::kAudioServiceAudioStreams,
-          features::kAudioServiceLaunchOnStartup,
-          features::kAudioServiceOutOfProcess,
-      },
-      {});
-
   InProcessBrowserTest::SetUp();
 }
 

chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.h

@@ -11,7 +11,6 @@
 
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
-#include "base/test/scoped_feature_list.h"
 #include "base/test/trace_event_analyzer.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
@@ -136,9 +135,6 @@ class TabCapturePerformanceTestBase : public InProcessBrowserTest {
 
   const extensions::Extension* extension_ = nullptr;
 
-  // Manages the Audio Service feature set, enabled for these performance tests.
-  base::test::ScopedFeatureList feature_list_;
-
   DISALLOW_COPY_AND_ASSIGN(TabCapturePerformanceTestBase);
 };