Refactor UKM interface for mojo-ification

chrome/browser/plugins/plugin_info_message_filter.cc

 // Copyright (c) 2012 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/plugins/plugin_info_message_filter.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 21 matching lines @@
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/rappor_service_impl.h"
-#include "components/ukm/ukm_entry_builder.h"
-#include "components/ukm/ukm_service.h"
+#include "components/ukm/public/ukm_entry_builder.h"
+#include "components/ukm/public/ukm_recorder.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/plugin_service_filter.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/content_constants.h"
 #include "extensions/features/features.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "ppapi/features/features.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ skipping 122 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   always_authorize_plugins_.Destroy();
   allow_outdated_plugins_.Destroy();
 }
 
 PluginInfoMessageFilter::PluginInfoMessageFilter(int render_process_id,
                                                  Profile* profile)
     : BrowserMessageFilter(ChromeMsgStart),
       context_(render_process_id, profile),
       main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
-      ukm_source_id_(ukm::UkmService::GetNewSourceID()) {
+      ukm_source_id_(ukm::UkmRecorder::GetNewSourceID()) {
   shutdown_notifier_ =
       ShutdownNotifierFactory::GetInstance()->Get(profile)->Subscribe(
           base::Bind(&PluginInfoMessageFilter::ShutdownOnUIThread,
                      base::Unretained(this)));
 }
 
 void PluginInfoMessageFilter::ShutdownOnUIThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   context_.ShutdownOnUIThread();
   shutdown_notifier_.reset();
@@ skipping 330 matching lines @@
                        params.render_frame_id, output->actual_mime_type,
                        params.url, params.main_frame_origin, ukm_source_id_));
   }
 }
 
 void PluginInfoMessageFilter::ReportMetrics(
     int render_frame_id,
     const base::StringPiece& mime_type,
     const GURL& url,
     const url::Origin& main_frame_origin,
-    int32_t ukm_source_id) {
+    ukm::SourceId ukm_source_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   content::RenderFrameHost* frame = content::RenderFrameHost::FromID(
       context_.render_process_id(), render_frame_id);
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(frame);
   // This can occur the web contents has already been closed or navigated away.
   if (!web_contents)
     return;
 
@@ skipping 15 matching lines @@
   rappor_service->RecordSampleString(
       "Plugins.FlashOriginUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
       net::registry_controlled_domains::GetDomainAndRegistry(
           main_frame_origin.GetURL(),
           net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
   rappor_service->RecordSampleString(
       "Plugins.FlashUrl", rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
       net::registry_controlled_domains::GetDomainAndRegistry(
           url, net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES));
 
-  ukm::UkmService* ukm_service = g_browser_process->ukm_service();
-  if (!ukm_service)
+  ukm::UkmRecorder* ukm_recorder = g_browser_process->ukm_recorder();
+  if (!ukm_recorder)
     return;
-  ukm_service->UpdateSourceURL(ukm_source_id,
-                               web_contents->GetLastCommittedURL());
+  ukm_recorder->UpdateSourceURL(ukm_source_id,
+                                web_contents->GetLastCommittedURL());
   // UkmEntryBuilder records the entry when it goes out of scope.
   std::unique_ptr<ukm::UkmEntryBuilder> builder =
-      ukm_service->GetEntryBuilder(ukm_source_id, "Plugins.FlashInstance");
+      ukm_recorder->GetEntryBuilder(ukm_source_id, "Plugins.FlashInstance");
 }
 
 void PluginInfoMessageFilter::Context::MaybeGrantAccess(
     ChromeViewHostMsg_GetPluginInfo_Status status,
     const base::FilePath& path) const {
   if (status == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed ||
       status == ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent) {
     ChromePluginServiceFilter::GetInstance()->AuthorizePlugin(
         render_process_id_, path);
   }
 }
 
 bool PluginInfoMessageFilter::Context::IsPluginEnabled(
     const content::WebPluginInfo& plugin) const {
   return plugin_prefs_->IsPluginEnabled(plugin);
 }