BASELINE: Update Chromium to 74.0.3729.159

Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 2 insertions, 64 deletions

diff --git a/chromium/services/resource_coordinator/resource_coordinator_service.cc b/chromium/services/resource_coordinator/resource_coordinator_service.cc
index 241a04dcf69..ac977a10343 100644
--- a/chromium/services/resource_coordinator/resource_coordinator_service.cc
+++ b/chromium/services/resource_coordinator/resource_coordinator_service.cc
@@ -7,55 +7,22 @@
 #include <utility>
 
 #include "base/feature_list.h"
+#include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "services/metrics/public/cpp/mojo_ukm_recorder.h"
 #include "services/resource_coordinator/memory_instrumentation/coordinator_impl.h"
-#include "services/resource_coordinator/observers/metrics_collector.h"
-#include "services/resource_coordinator/observers/page_signal_generator_impl.h"
 #include "services/resource_coordinator/public/cpp/resource_coordinator_features.h"
 
-#if defined(OS_WIN)
-#include "services/resource_coordinator/observers/working_set_trimmer_win.h"
-#endif
-
 namespace resource_coordinator {
 
 ResourceCoordinatorService::ResourceCoordinatorService(
     service_manager::mojom::ServiceRequest request)
     : service_binding_(this, std::move(request)),
-      service_keepalive_(&service_binding_, base::nullopt /* idle_timeout */),
-      introspector_(&coordination_unit_graph_) {}
+      service_keepalive_(&service_binding_, base::nullopt /* idle_timeout */) {}
 
 ResourceCoordinatorService::~ResourceCoordinatorService() = default;
 
 void ResourceCoordinatorService::OnStart() {
-  ukm_recorder_ = ukm::MojoUkmRecorder::Create(service_binding_.GetConnector());
-
-  registry_.AddInterface(
-      base::Bind(&CoordinationUnitIntrospectorImpl::BindToInterface,
-                 base::Unretained(&introspector_)));
-
-  // Register new |CoordinationUnitGraphObserver| implementations here.
-  auto page_signal_generator_impl = std::make_unique<PageSignalGeneratorImpl>();
-  registry_.AddInterface(
-      base::Bind(&PageSignalGeneratorImpl::BindToInterface,
-                 base::Unretained(page_signal_generator_impl.get())));
-  coordination_unit_graph_.RegisterObserver(
-      std::move(page_signal_generator_impl));
-
-  coordination_unit_graph_.RegisterObserver(
-      std::make_unique<MetricsCollector>());
-
-#if defined(OS_WIN)
-  if (base::FeatureList::IsEnabled(features::kEmptyWorkingSet)) {
-    coordination_unit_graph_.RegisterObserver(
-        std::make_unique<WorkingSetTrimmer>());
-  }
-#endif
-
-  coordination_unit_graph_.OnStart(&registry_, &service_keepalive_);
-  coordination_unit_graph_.set_ukm_recorder(ukm_recorder_.get());
-
   // TODO(chiniforooshan): The abstract class Coordinator in the
   // public/cpp/memory_instrumentation directory should not be needed anymore.
   // We should be able to delete that and rename
@@ -70,8 +37,6 @@ void ResourceCoordinatorService::OnStart() {
   registry_.AddInterface(base::BindRepeating(
       &memory_instrumentation::CoordinatorImpl::BindHeapProfilerHelperRequest,
       base::Unretained(memory_instrumentation_coordinator_.get())));
-  registry_.AddInterface(base::BindRepeating(
-      &ResourceCoordinatorService::BindWebUIGraphDump, base::Unretained(this)));
 }
 
 void ResourceCoordinatorService::OnBindInterface(
@@ -82,31 +47,4 @@ void ResourceCoordinatorService::OnBindInterface(
                           source_info);
 }
 
-void ResourceCoordinatorService::BindWebUIGraphDump(
-    mojom::WebUIGraphDumpRequest request,
-    const service_manager::BindSourceInfo& source_info) {
-  std::unique_ptr<WebUIGraphDumpImpl> graph_dump =
-      std::make_unique<WebUIGraphDumpImpl>(&coordination_unit_graph_);
-
-  auto error_callback =
-      base::BindOnce(&ResourceCoordinatorService::OnGraphDumpConnectionError,
-                     base::Unretained(this), graph_dump.get());
-  graph_dump->Bind(std::move(request), std::move(error_callback));
-
-  graph_dumps_.push_back(std::move(graph_dump));
-}
-
-void ResourceCoordinatorService::OnGraphDumpConnectionError(
-    WebUIGraphDumpImpl* graph_dump) {
-  const auto it = std::find_if(
-      graph_dumps_.begin(), graph_dumps_.end(),
-      [graph_dump](const std::unique_ptr<WebUIGraphDumpImpl>& graph_dump_ptr) {
-        return graph_dump_ptr.get() == graph_dump;
-      });
-
-  DCHECK(it != graph_dumps_.end());
-
-  graph_dumps_.erase(it);
-}
-
 }  // namespace resource_coordinator