Enable V8PerFrameMemoryReporterImpl on Android

Ads measurements that use V8PerFrameMemoryReporter will run on Android
so the assumption that it can be turned off on Android to save memory is
obsolete.

R=dcheng

Bug: 1117176
Change-Id: Ia73718d52cfb33aebed31033961ef84f678fc532
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2375935Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801605}

third_party/blink/renderer/controller/BUILD.gn

@@ -45,6 +45,10 @@ component("controller") {
     "memory_usage_monitor.h",
     "performance_manager/renderer_resource_coordinator_impl.cc",
     "performance_manager/renderer_resource_coordinator_impl.h",
+    "performance_manager/v8_per_frame_memory_reporter_impl.cc",
+    "performance_manager/v8_per_frame_memory_reporter_impl.h",
+    "performance_manager/v8_worker_memory_reporter.cc",
+    "performance_manager/v8_worker_memory_reporter.h",
   ]
 
   if (is_linux || is_chromeos) {
@@ -63,13 +67,6 @@ component("controller") {
       "oom_intervention_impl.cc",
       "oom_intervention_impl.h",
     ]
-  } else {
-    sources += [
-      "performance_manager/v8_per_frame_memory_reporter_impl.cc",
-      "performance_manager/v8_per_frame_memory_reporter_impl.h",
-      "performance_manager/v8_worker_memory_reporter.cc",
-      "performance_manager/v8_worker_memory_reporter.h",
-    ]
   }
   if (is_win) {
     sources += [
@@ -172,7 +169,11 @@ source_set("blink_unittests_sources") {
   visibility = [ "*" ]
   testonly = true
 
-  sources = [ "tests/run_all_tests.cc" ]
+  sources = [
+    "performance_manager/v8_per_frame_memory_reporter_impl_test.cc",
+    "performance_manager/v8_worker_memory_reporter_test.cc",
+    "tests/run_all_tests.cc",
+  ]
   sources += bindings_unittest_files
   if (is_linux || is_chromeos) {
     sources += [ "memory_usage_monitor_posix_test.cc" ]
@@ -183,11 +184,6 @@ source_set("blink_unittests_sources") {
       "oom_intervention_impl_test.cc",
       "user_level_memory_pressure_signal_generator_test.cc",
     ]
-  } else {
-    sources += [
-      "performance_manager/v8_per_frame_memory_reporter_impl_test.cc",
-      "performance_manager/v8_worker_memory_reporter_test.cc",
-    ]
   }
 
   if (is_linux || is_chromeos || is_android || is_mac || is_win) {

third_party/blink/renderer/controller/blink_initializer.cc

@@ -46,6 +46,7 @@
 #include "third_party/blink/renderer/controller/blink_leak_detector.h"
 #include "third_party/blink/renderer/controller/dev_tools_frontend_impl.h"
 #include "third_party/blink/renderer/controller/performance_manager/renderer_resource_coordinator_impl.h"
+#include "third_party/blink/renderer/controller/performance_manager/v8_per_frame_memory_reporter_impl.h"
 #include "third_party/blink/renderer/core/animation/animation_clock.h"
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/execution_context/agent.h"
@@ -64,8 +65,6 @@
 #if defined(OS_ANDROID)
 #include "third_party/blink/renderer/controller/crash_memory_metrics_reporter_impl.h"
 #include "third_party/blink/renderer/controller/oom_intervention_impl.h"
-#else
-#include "third_party/blink/renderer/controller/performance_manager/v8_per_frame_memory_reporter_impl.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
@@ -209,12 +208,6 @@ void BlinkInitializer::RegisterInterfaces(mojo::BinderMap& binders) {
   binders.Add(ConvertToBaseRepeatingCallback(CrossThreadBindRepeating(
                   &CrashMemoryMetricsReporterImpl::Bind)),
               main_thread->GetTaskRunner());
-#else
-  // Currently nothing on Android samples V8PerFrameMemory, so only initialize
-  // the reporter on desktop to save memory.
-  binders.Add(ConvertToBaseRepeatingCallback(CrossThreadBindRepeating(
-                  &V8PerFrameMemoryReporterImpl::Create)),
-              main_thread->GetTaskRunner());
 #endif
 
 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
@@ -230,6 +223,10 @@ void BlinkInitializer::RegisterInterfaces(mojo::BinderMap& binders) {
   binders.Add(ConvertToBaseRepeatingCallback(
                   CrossThreadBindRepeating(&DiskDataAllocator::Bind)),
               main_thread->GetTaskRunner());
+
+  binders.Add(ConvertToBaseRepeatingCallback(CrossThreadBindRepeating(
+                  &V8PerFrameMemoryReporterImpl::Create)),
+              main_thread->GetTaskRunner());
 }
 
 void BlinkInitializer::InitLocalFrame(LocalFrame& frame) const {