Remove unnecessary threading concerns from VrMetricsHelper.

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/public/rappor_utils.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 157 matching lines @@
   } else if (is_webvr_) {
     mode = VRMode::WEBVR;
   } else {
     mode = is_fullscreen_ ? VRMode::VR_FULLSCREEN : VRMode::VR_BROWSER;
   }
 
   if (mode != mode_)
     SetVrMode(mode);
 }
 
-void VrMetricsHelper::SetWebVREnabledOnMainThread(bool is_webvr_presenting) {
-  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
+void VrMetricsHelper::SetWebVREnabled(bool is_webvr_presenting) {
   is_webvr_ = is_webvr_presenting;
   UpdateMode();
 }
 
-void VrMetricsHelper::SetVRActiveOnMainThread(bool is_vr_enabled) {
-  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
+void VrMetricsHelper::SetVRActive(bool is_vr_enabled) {
   is_vr_enabled_ = is_vr_enabled;
   UpdateMode();
 }
 
-void VrMetricsHelper::SetWebVREnabled(bool is_webvr) {
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI, FROM_HERE,
-      base::Bind(&VrMetricsHelper::SetWebVREnabledOnMainThread, this,
-                 is_webvr));
-}
-
-void VrMetricsHelper::SetVRActive(bool is_vr_enabled) {
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI, FROM_HERE,
-      base::Bind(&VrMetricsHelper::SetVRActiveOnMainThread, this,
-                 is_vr_enabled));
-}
-
 void VrMetricsHelper::SetVrMode(VRMode mode) {
   DCHECK(mode != mode_);
 
   base::Time switchTime = base::Time::Now();
 
   // stop the previous modes
   if (mode_ != VRMode::NO_VR) {
     if (num_videos_playing_ > 0)
       mode_video_timer_->StopSession(false, switchTime);
 
@@ skipping 57 matching lines @@
 
     if (num_videos_playing_ > 0) {
       session_video_timer_->StartSession(switchTime);
       num_session_video_playback_ = num_videos_playing_;
     }
   }
 
   mode_ = mode;
 }
 
-VrMetricsHelper::VrMetricsHelper(content::WebContents* contents)
-    : thread_id_(base::PlatformThread::CurrentId()) {
+VrMetricsHelper::VrMetricsHelper(content::WebContents* contents) {
   num_videos_playing_ = contents->GetCurrentlyPlayingVideoCount();
   is_fullscreen_ = contents->IsFullscreen();
   origin_ = contents->GetLastCommittedURL();
 
   Observe(contents);
   session_timer_.reset(new SessionTimerImpl<SESSION_VR>(
       maximumHeadsetSessionGap, minimumHeadsetSessionDuration));
   session_video_timer_.reset(new SessionTimerImpl<SESSION_VR_WITH_VIDEO>(
       maximumVideoSessionGap, minimumVideoSessionDuration));
 }
 
-VrMetricsHelper::~VrMetricsHelper() {
-  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
-}
+VrMetricsHelper::~VrMetricsHelper() = default;
 
 void VrMetricsHelper::MediaStartedPlaying(const MediaPlayerInfo& media_info,
                                           const MediaPlayerId&) {
-  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   if (!media_info.has_video)
     return;
 
   if (num_videos_playing_ == 0) {
     // started playing video - start sessions
     base::Time start_time = base::Time::Now();
 
     if (mode_ != VRMode::NO_VR) {
       session_video_timer_->StartSession(start_time);
       mode_video_timer_->StartSession(start_time);
       SendRapporEnteredVideoMode(origin_, mode_);
     }
   }
 
   num_videos_playing_++;
   num_session_video_playback_++;
 }
 
 void VrMetricsHelper::MediaStoppedPlaying(const MediaPlayerInfo& media_info,
                                           const MediaPlayerId&) {
-  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   if (!media_info.has_video)
     return;
 
   num_videos_playing_--;
 
   if (num_videos_playing_ == 0) {
     // stopped playing video - update existing video sessions
     base::Time stop_time = base::Time::Now();
 
     if (mode_ != VRMode::NO_VR) {
       session_video_timer_->StopSession(true, stop_time);
       mode_video_timer_->StopSession(true, stop_time);
     }
   }
 }
 
 void VrMetricsHelper::DidFinishNavigation(content::NavigationHandle* handle) {
-  DCHECK_EQ(thread_id_, base::PlatformThread::CurrentId());
   if (handle != nullptr && handle->HasCommitted() && handle->IsInMainFrame()) {
     origin_ = handle->GetURL();
     // Counting the number of pages viewed is difficult - some websites load
     // new content dynamically without a navigation.  Others redirect several
     // times for a single navigation.
     // We look at the number of committed navigations in the main frame, which
     // will slightly overestimate pages viewed instead of trying to filter or
     // look at page loads, since those will underestimate on some pages, and
     // overestimate on others.
     num_session_navigation_++;
   }
 }
 
 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