Pass RapporService to content/browser/

chrome/browser/chromeos/resource_reporter/resource_reporter.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
 
 #include <cstdint>
 #include <queue>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/memory_coordinator_client_registry.h"
 #include "base/memory/memory_pressure_monitor.h"
 #include "base/memory/ptr_util.h"
 #include "base/rand_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/task_manager/task_manager_interface.h"
-#include "components/rappor/rappor_service.h"
+#include "components/rappor/rappor_service_impl.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
 namespace {
 
 #define GET_ENUM_VAL(enum_entry) static_cast<int>(enum_entry)
 
 // At a critical memory pressure event, we only care about a single complete
 // refresh from the task manager (with background calculations). So we request
@@ skipping 186 matching lines @@
       task_manager_to_observe_(nullptr),
       system_cpu_cores_range_(GetCurrentSystemCpuCoresRange()),
       last_browser_process_cpu_(0.0),
       last_gpu_process_cpu_(0.0),
       last_browser_process_memory_(0),
       last_gpu_process_memory_(0),
       is_monitoring_(false) {}
 
 // static
 std::unique_ptr<rappor::Sample> ResourceReporter::CreateRapporSample(
-    rappor::RapporService* rappor_service,
+    rappor::RapporServiceImpl* rappor_service,
     const ResourceReporter::TaskRecord& task_record) {
   std::unique_ptr<rappor::Sample> sample(
       rappor_service->CreateSample(rappor::UMA_RAPPOR_TYPE));
   sample->SetStringField(kRapporTaskStringField,
                          task_record.task_name_for_rappor);
   sample->SetFlagsField(kRapporPriorityFlagsField,
                         task_record.is_background ?
                             GET_ENUM_VAL(TaskProcessPriority::BACKGROUND) :
                             GET_ENUM_VAL(TaskProcessPriority::FOREGROUND),
                         GET_ENUM_VAL(TaskProcessPriority::NUM_PRIORITIES));
@@ skipping 126 matching lines @@
   if (sampled_cpu_task) {
     std::unique_ptr<rappor::Sample> cpu_sample(
         CreateRapporSample(rappor_service, *sampled_cpu_task));
     cpu_sample->SetFlagsField(kRapporNumCoresRangeFlagsField,
                               GET_ENUM_VAL(system_cpu_cores_range_),
                               GET_ENUM_VAL(CpuCoresNumberRange::NUM_RANGES));
     cpu_sample->SetFlagsField(
         kRapporUsageRangeFlagsField,
         GET_ENUM_VAL(GetCpuUsageRange(sampled_cpu_task->cpu_percent)),
         GET_ENUM_VAL(CpuUsageRange::NUM_RANGES));
-    rappor_service->RecordSampleObj(kCpuRapporMetric, std::move(cpu_sample));
+    rappor_service->RecordSample(kCpuRapporMetric, std::move(cpu_sample));
   }
 
   // Use weighted random sampling to select a task to report in the memory
   // metric.
   const TaskRecord* sampled_memory_task = SampleTaskByMemory();
   if (sampled_memory_task) {
     std::unique_ptr<rappor::Sample> memory_sample(
         CreateRapporSample(rappor_service, *sampled_memory_task));
     memory_sample->SetFlagsField(
         kRapporUsageRangeFlagsField,
         GET_ENUM_VAL(GetMemoryUsageRange(sampled_memory_task->memory_bytes)),
         GET_ENUM_VAL(MemoryUsageRange::NUM_RANGES));
-    rappor_service->RecordSampleObj(kMemoryRapporMetric,
-                                    std::move(memory_sample));
+    rappor_service->RecordSample(kMemoryRapporMetric, std::move(memory_sample));
   }
 }
 
 void ResourceReporter::OnMemoryPressure(
     MemoryPressureLevel memory_pressure_level) {
   if (memory_pressure_level ==
       MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_CRITICAL) {
     StartRecordingCurrentState();
   } else {
     StopRecordingCurrentState();
@@ skipping 43 matching lines @@
       break;
     case base::MemoryState::SUSPENDED:
     // Note: Not supported at present. Fall through.
     case base::MemoryState::UNKNOWN:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos