[UMA, Cleanup] Clean up the profiler metrics provider a bit.

There's no need to special-case the Android logic within the metrics provider
code, as the callback already does so.

BUG=none
TEST=none
R=asvitkine@chromium.org

Review URL: https://codereview.chromium.org/1310513002

Cr-Commit-Position: refs/heads/master@{#345088}

1 files changed, 7 insertions, 7 deletions

diff --git a/components/metrics/profiler/profiler_metrics_provider.cc b/components/metrics/profiler/profiler_metrics_provider.cc
index 341f74e..79173c7 100644
--- a/components/metrics/profiler/profiler_metrics_provider.cc
+++ b/components/metrics/profiler/profiler_metrics_provider.cc
@@ -14,7 +14,6 @@
 #include "components/nacl/common/nacl_process_type.h"
 
 namespace metrics {
-
 namespace {
 
 ProfilerEventProto::TrackedObject::ProcessType AsProtobufProcessType(
@@ -137,8 +136,11 @@ void ProfilerMetricsProvider::RecordProfilerData(
     base::TimeDelta phase_start,
     base::TimeDelta phase_finish,
     const ProfilerEvents& past_events) {
+  // Omit profiler data on connections where it's likely to cost the user money
+  // for us to upload it.
   if (IsCellularLogicEnabled())
     return;
+
   if (tracked_objects::GetTimeSourceType() !=
       tracked_objects::TIME_SOURCE_TYPE_WALL_TIME) {
     // We currently only support the default time source, wall clock time.
@@ -164,12 +166,10 @@ void ProfilerMetricsProvider::RecordProfilerData(
 }
 
 bool ProfilerMetricsProvider::IsCellularLogicEnabled() {
-// For android get current connection type if the callback exists.
-#if defined(OS_ANDROID)
-  if (!cellular_callback_.is_null())
-    return cellular_callback_.Run();
-#endif
-  return false;
+  if (cellular_callback_.is_null())
+    return false;
+
+  return cellular_callback_.Run();
 }
 
 }  // namespace metrics