Re-enable rappor for vrshell

chrome/browser/android/vr_shell/vr_usage_monitor.cc

 // Copyright 2016 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 "vr_usage_monitor.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/browser_process.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/browser_thread.h"
 
-// There is a dependency cycle between chrome/brower and
-// chrome/browser/android/vr_shell.  To temporarily fix and unblock tests,
-// don't send rappor events.
-#define ALLOW_SENDING_RAPPOR_EVENTS 0
-
 namespace vr_shell {
 
 // minimum duration: 7 seconds for video, no minimum for headset/vr modes
 // maximum gap: 7 seconds between videos.  no gap for headset/vr-modes
 namespace {
 base::TimeDelta minimumVideoSessionDuration(base::TimeDelta::FromSecondsD(7));
 base::TimeDelta maximumVideoSessionGap(base::TimeDelta::FromSecondsD(7));
 
 base::TimeDelta maximumHeadsetSessionGap(base::TimeDelta::FromSecondsD(0));
 base::TimeDelta minimumHeadsetSessionDuration(base::TimeDelta::FromSecondsD(0));
@@ skipping 50 matching lines @@
       return VrSessionVideo;
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
 void SendRapporEnteredMode(const GURL& origin, VRMode mode) {
   switch (mode) {
     case VRMode::VR_FULLSCREEN:
-#if ALLOW_SENDING_RAPPOR_EVENTS
-      rappor::SampleDomainAndRegistryFromGURL(
-          g_browser_process->rappor_service(), "VR.FullScreenMode", origin);
-#endif
+      rappor::SampleDomainAndRegistryFromGURL(rappor::GetDefaultService(),
+                                              "VR.FullScreenMode", origin);
     default:
       break;
   }
 }
 
 void SendRapporEnteredVideoMode(const GURL& origin, VRMode mode) {
-#if ALLOW_SENDING_RAPPOR_EVENTS
   switch (mode) {
     case VRMode::VR_BROWSER:
-      rappor::SampleDomainAndRegistryFromGURL(
-          g_browser_process->rappor_service(), "VR.Video.Browser", origin);
+      rappor::SampleDomainAndRegistryFromGURL(rappor::GetDefaultService(),
+                                              "VR.Video.Browser", origin);
     case VRMode::WEBVR:
-      rappor::SampleDomainAndRegistryFromGURL(
-          g_browser_process->rappor_service(), "VR.Video.WebVR", origin);
+      rappor::SampleDomainAndRegistryFromGURL(rappor::GetDefaultService(),
+                                              "VR.Video.WebVR", origin);
     case VRMode::VR_FULLSCREEN:
       rappor::SampleDomainAndRegistryFromGURL(
-          g_browser_process->rappor_service(), "VR.Video.FullScreenMode",
-          origin);
+          rappor::GetDefaultService(), "VR.Video.FullScreenMode", origin);
     default:
       break;
   }
-#endif
 }
 }  // namespace
 
 template <SessionEventName sessionType>
 class SessionTimerImpl : public SessionTimer {
  public:
   SessionTimerImpl(base::TimeDelta gap_time, base::TimeDelta minimum_duration) {
     maximum_session_gap_time_ = gap_time;
     minimum_duration_ = minimum_duration;
   }
@@ skipping 238 matching lines @@
 }
 
 void VrMetricsHelper::DidToggleFullscreenModeForTab(bool entered_fullscreen,
                                                     bool will_cause_resize) {
   DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   is_fullscreen_ = entered_fullscreen;
   UpdateMode();
 }
 
 }  // namespace vr_shell