Revert "Make the producer name include the host_package_name on Android."

This reverts commit 9f0e99aa.

Reason for revert: Suspect of causing test failures in linux-chromeos-dbg

First failure:
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-dbg/18126

services_unittests failed because of:
PerfettoIntegrationTest.PacketsEndToEndProducerFirst
PerfettoIntegrationTest.ProducerDatasourceInitialized
SystemPerfettoTest.MultipleSystemAndLocalSourcesLocalFirst
PerfettoIntegrationTest.ClientEnabledAndDisabled
...


Original change's description:
> Make the producer name include the host_package_name on Android.
> 
> This allows you to trace with perfetto "producer_name_filter" to scope
> your system traces to only particular apps (chrome stable/canary/etc).
> 
> Change-Id: I9a677a8d8edfdf6645eb50d9e77e9ffb025ca94d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144135
> Commit-Queue: Daniel Cheng <dcheng@chromium.org>
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Reviewed-by: Eric Seckler <eseckler@chromium.org>
> Auto-Submit: Stephen Nusko <nuskos@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#759188}

TBR=dcheng@chromium.org,eseckler@chromium.org,nuskos@chromium.org

Change-Id: I3cf97d68304aee6fc4afc90b954d02cbb6ce700e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146906Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759214}

services/tracing/public/cpp/perfetto/posix_system_producer.cc

@@ -363,30 +363,13 @@ bool PosixSystemProducer::SetupSharedMemoryForStartupTracing() {
 void PosixSystemProducer::ConnectSocket() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   state_ = State::kConnecting;
-  const char* host_package_name = nullptr;
-#if defined(OS_ANDROID)
-  host_package_name =
-      base::android::BuildInfo::GetInstance()->host_package_name();
-#endif  // defined(OS_ANDROID)
-
-  // On android we want to include if this is webview inside of an app or
-  // Android Chrome. To aid this we add the host_package_name to differentiate
-  // the various apps and sources.
-  std::string producer_name;
-  if (host_package_name) {
-    producer_name = base::StrCat(
-        {mojom::kPerfettoProducerNamePrefix, host_package_name, "-",
-         base::NumberToString(
-             base::trace_event::TraceLog::GetInstance()->process_id())});
-  } else {
-    producer_name = base::StrCat(
-        {mojom::kPerfettoProducerNamePrefix,
-         base::NumberToString(
-             base::trace_event::TraceLog::GetInstance()->process_id())});
-  }
-
   auto service = perfetto::ProducerIPCClient::Connect(
-      socket_name_.c_str(), this, std::move(producer_name), task_runner(),
+      socket_name_.c_str(), this,
+      base::StrCat(
+          {mojom::kPerfettoProducerNamePrefix,
+           base::NumberToString(
+               base::trace_event::TraceLog::GetInstance()->process_id())}),
+      task_runner(),
       perfetto::TracingService::ProducerSMBScrapingMode::kEnabled);
 
   base::AutoLock lock(lock_);

services/tracing/public/mojom/perfetto_service.mojom

@@ -4,13 +4,7 @@
 
 module tracing.mojom;
 
-// Producer processes register with the format
-// "kPerfettoProducerNamePrefix-PID" when connecting to Chrome's internal
-// tracing service. Note that system producers use a different but similar
-// naming scheme to disambiguate between different apps on the same system,
-// see SystemProducer::ConnectToSystemService() implementations. Of
-// particular interest is PosixSystemProducer::ConnectSocket().
-const string kPerfettoProducerNamePrefix = "org.chromium-";
+const string kPerfettoProducerNamePrefix = "org.chromium.perfetto_producer.";
 const string kTraceEventDataSourceName = "org.chromium.trace_event";
 const string kMetaDataSourceName = "org.chromium.trace_metadata";
 const string kSystemTraceDataSourceName = "org.chromium.trace_system";