Revert "cobalt/browser/metrics: Skeleton CobaltMetricsServiceClient " (youtube#5000)

This reverts commit 2339500 (34934). 

Broke Chrobalt-ATv run.

Bug: b/400441729

Author: yell0wd0g

cobalt/BUILD.gn

@@ -84,15 +84,10 @@ action("cobalt_build_info") {
 test("cobalt_unittests") {
   testonly = true
 
-  sources = [
-    "//cobalt/browser/metrics/cobalt_metrics_service_client_test.cc",
-    "//cobalt/user_agent/user_agent_platform_info_test.cc",
-  ]
+  sources = [ "//cobalt/user_agent/user_agent_platform_info_test.cc" ]
 
   deps = [
     "//base/test:run_all_unittests",
-    "//base/test:test_support",
-    "//cobalt/browser:metrics",
     "//cobalt/user_agent",
     "//starboard:starboard_group",
     "//testing/gmock",

cobalt/android/BUILD.gn

@@ -266,7 +266,7 @@ template("content_shell_apk_tmpl") {
 
 # Copied from target: libcontent_shell_content_view
 # TODO(b/376867565) rename this library, NO shell
-source_set("libcobalt_content_shell_content_view") {
+shared_library("libcobalt_content_shell_content_view") {
   # TODO(b/375655377): remove testonly
   testonly = true
   deps = [
@@ -299,6 +299,7 @@ source_set("libcobalt_content_shell_content_view") {
     "//cobalt/cobalt_main_delegate.h",
     "cobalt_library_loader.cc",
   ]
+  configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
   configs += [ "//build/config/android:hide_all_but_jni" ]
 }
 

cobalt/browser/BUILD.gn

@@ -39,7 +39,6 @@ source_set("browser") {
 
   deps = [
     ":embed_polyfilled_javascript",
-    ":metrics",
     "//cobalt/browser/crash_annotator/public/mojom",
     "//cobalt/browser/h5vcc_runtime",
     "//cobalt/browser/h5vcc_runtime/public/mojom",
@@ -51,8 +50,6 @@ source_set("browser") {
     "//components/js_injection/browser:browser",
     "//components/os_crypt/sync",
     "//content/public/browser",
-
-    # TODO(b/390021478): Do not depend on content_shell_lib here.
     "//content/shell:content_shell_lib",
   ]
 
@@ -88,21 +85,3 @@ action("embed_polyfilled_javascript") {
     rebase_path("embedded_resources", root_build_dir),
   ]
 }
-
-source_set("metrics") {
-  # TODO(cobalt, b/375655377): remove testonly declaration, needed because of
-  # being depended-on by :browser above.
-  testonly = true
-
-  sources = [
-    "metrics/cobalt_metrics_service_client.cc",
-    "metrics/cobalt_metrics_service_client.h",
-  ]
-  deps = [
-    "//components/metrics",
-    "//components/prefs",
-    "//components/variations",
-    "//content/public/browser",
-    "//url",
-  ]
-}

cobalt/browser/cobalt_content_browser_client.cc

@@ -20,7 +20,6 @@
 #include "base/i18n/rtl.h"
 #include "cobalt/browser/cobalt_browser_interface_binders.h"
 #include "cobalt/browser/cobalt_web_contents_observer.h"
-#include "cobalt/browser/metrics/cobalt_metrics_service_client.h"
 #include "cobalt/media/service/mojom/video_geometry_setter.mojom.h"
 #include "cobalt/user_agent/user_agent_platform_info.h"
 #include "content/public/browser/browser_thread.h"
@@ -88,11 +87,8 @@ class CobaltBrowserMainParts : public content::ShellBrowserMainParts {
 
   // ShellBrowserMainParts overrides.
   int PreCreateThreads() override {
-    metrics_ = std::make_unique<CobaltMetricsServiceClient>();
-    // TODO(b/372559349): Double check that this initializes UMA collection,
-    // similar to what ChromeBrowserMainParts::StartMetricsRecording() does.
-    // It might need to be moved to other parts, e.g. PreMainMessageLoopRun().
-    metrics_->Start();
+    // TODO(b/372559349): setup metrics similarly to what SetupMetrics() does
+    // when called from ChromeBrowserMainParts::PreCreateThreadsImpl().
     return ShellBrowserMainParts::PreCreateThreads();
   }
 
@@ -130,9 +126,6 @@ class CobaltBrowserMainParts : public content::ShellBrowserMainParts {
     ShellBrowserMainParts::PostCreateMainMessageLoop();
   }
 #endif  // BUILDFLAG(IS_LINUX)
-
- private:
-  std::unique_ptr<CobaltMetricsServiceClient> metrics_;
 };
 
 std::string GetCobaltUserAgent() {