Revert "Adjust gn and ifdefs to make Perfetto available"

This reverts commit 89d0b86d.

Reason for revert: Suspected cause of Win x64 build failure:
https://ci.chromium.org/buildbot/chromium/Win%20x64/22844

Original change's description:
> Adjust gn and ifdefs to make Perfetto available
> 
> Chrome has seven #ifdefs that decide whether Perfetto tracing is
> available or not. This change consolidates those into two and then
> enables Perfetto on Windows.
> 
> This change also updates two .gn files to enable Perfetto.
> 
> This change makes no difference unless the command-line option
> --enable-features=TracingPerfettoBackend is specified.
> 
> Note that this change will fail to run unless the Assert in Angle's
> AddTraceEvent function in event_tracer.cpp is removed. This is
> being investigated.
> 
> Bug: 844421
> Change-Id: Ia978eb69bed77bda68202fdbec7a306fdb9886bc
> Reviewed-on: https://chromium-review.googlesource.com/1064371
> Commit-Queue: oysteine <oysteine@chromium.org>
> Reviewed-by: oysteine <oysteine@chromium.org>
> Reviewed-by: Primiano Tucci <primiano@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#561556}

TBR=primiano@chromium.org,oysteine@chromium.org,brucedawson@chromium.org

Change-Id: Ia94b6d81d56af41dd010adcc436f11882887864f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 844421
Reviewed-on: https://chromium-review.googlesource.com/1072327Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561580}

services/tracing/BUILD.gn

@@ -28,7 +28,7 @@ source_set("lib") {
     "//services/tracing/public/cpp",
   ]
 
-  if (is_mac || is_linux || is_android || is_win) {
+  if (is_mac || is_linux || is_android) {
     sources += [
       "perfetto/json_trace_exporter.cc",
       "perfetto/json_trace_exporter.h",

services/tracing/public/cpp/BUILD.gn

@@ -22,7 +22,7 @@ component("cpp") {
     "//services/tracing/public/mojom",
   ]
 
-  if (is_mac || is_linux || is_android || is_win) {
+  if (is_mac || is_linux || is_android) {
     sources += [
       "perfetto/producer_client.cc",
       "perfetto/producer_client.h",

services/tracing/public/cpp/trace_event_agent.cc

@@ -21,9 +21,7 @@
 #include "services/tracing/public/cpp/tracing_features.h"
 #include "services/tracing/public/mojom/constants.mojom.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-    defined(OS_WIN)
-#define PERFETTO_AVAILABLE
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
 #include "services/tracing/public/cpp/perfetto/producer_client.h"
 #endif
 
@@ -35,7 +33,7 @@ const char kTraceEventLabel[] = "traceEvents";
 
 namespace tracing {
 
-#if defined(PERFETTO_AVAILABLE)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
 class PerfettoTraceEventAgent : public TraceEventAgent {
  public:
   explicit PerfettoTraceEventAgent(service_manager::Connector* connector) {
@@ -67,7 +65,7 @@ std::unique_ptr<TraceEventAgent> TraceEventAgent::Create(
     service_manager::Connector* connector,
     bool request_clock_sync_marker_on_android) {
   if (TracingUsesPerfettoBackend()) {
-#if defined(PERFETTO_AVAILABLE)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
     return std::make_unique<PerfettoTraceEventAgent>(connector);
 #else
     LOG(FATAL) << "Perfetto is not yet available for this platform.";

services/tracing/tracing_service.cc

@@ -12,7 +12,7 @@
 #include "services/tracing/coordinator.h"
 #include "services/tracing/public/cpp/tracing_features.h"
 
-#if defined(PERFETTO_SERVICE_AVAILABLE)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
 #include "services/tracing/perfetto/perfetto_service.h"
 #include "services/tracing/perfetto/perfetto_tracing_coordinator.h"
 #endif
@@ -26,7 +26,7 @@ std::unique_ptr<service_manager::Service> TracingService::Create() {
 TracingService::TracingService() : weak_factory_(this) {}
 
 TracingService::~TracingService() {
-#if defined(PERFETTO_SERVICE_AVAILABLE)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
   if (perfetto_tracing_coordinator_) {
     PerfettoTracingCoordinator::DestroyOnSequence(
         std::move(perfetto_tracing_coordinator_));
@@ -48,7 +48,7 @@ void TracingService::OnStart() {
                           base::Unretained(tracing_agent_registry_.get())));
 
   if (TracingUsesPerfettoBackend()) {
-#if defined(PERFETTO_SERVICE_AVAILABLE)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
     perfetto_service_ = std::make_unique<tracing::PerfettoService>();
     registry_.AddInterface(
         base::BindRepeating(&tracing::PerfettoService::BindRequest,

services/tracing/tracing_service.h

@@ -18,11 +18,6 @@
 #include "services/tracing/agent_registry.h"
 #include "services/tracing/coordinator.h"
 
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-    defined(OS_WIN)
-#define PERFETTO_SERVICE_AVAILABLE
-#endif
-
 namespace tracing {
 
 class PerfettoTracingCoordinator;
@@ -55,7 +50,7 @@ class TracingService : public service_manager::Service {
   std::unique_ptr<Coordinator> tracing_coordinator_;
   std::unique_ptr<service_manager::ServiceContextRefFactory> ref_factory_;
 
-#if defined(PERFETTO_SERVICE_AVAILABLE)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
   std::unique_ptr<tracing::PerfettoService> perfetto_service_;
   std::unique_ptr<PerfettoTracingCoordinator> perfetto_tracing_coordinator_;
 #endif