Remove calls to MessageLoop::current() in content.

content/browser/gamepad/gamepad_provider.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 "content/browser/gamepad/gamepad_provider.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <cmath>
 #include <set>
@@ skipping 141 matching lines @@
 #endif
   polling_thread_->StartWithOptions(base::Thread::Options(kMessageLoopType, 0));
 
   polling_thread_->task_runner()->PostTask(
       FROM_HERE, base::Bind(&GamepadProvider::DoInitializePollingThread,
                             base::Unretained(this), base::Passed(&fetcher)));
 }
 
 void GamepadProvider::DoInitializePollingThread(
     std::unique_ptr<GamepadDataFetcher> fetcher) {
-  DCHECK(base::MessageLoop::current() == polling_thread_->message_loop());
+  DCHECK(polling_thread_->task_runner()->BelongsToCurrentThread());
   DCHECK(!data_fetcher_.get());  // Should only initialize once.
 
   if (!fetcher)
     fetcher.reset(new GamepadPlatformDataFetcher);
   data_fetcher_ = std::move(fetcher);
 }
 
 void GamepadProvider::SendPauseHint(bool paused) {
-  DCHECK(base::MessageLoop::current() == polling_thread_->message_loop());
+  DCHECK(polling_thread_->task_runner()->BelongsToCurrentThread());
   if (data_fetcher_)
     data_fetcher_->PauseHint(paused);
 }
 
 bool GamepadProvider::PadState::Match(const WebGamepad& pad) const {
   return connected_ == pad.connected &&
          axes_length_ == pad.axesLength &&
          buttons_length_ == pad.buttonsLength &&
          memcmp(id_, pad.id, sizeof(id_)) == 0 &&
          memcmp(mapping_, pad.mapping, sizeof(mapping_)) == 0;
@@ skipping 19 matching lines @@
   pad->connected = connected_;
   pad->axesLength = axes_length_;
   pad->buttonsLength = buttons_length_;
   memcpy(pad->id, id_, sizeof(id_));
   memcpy(pad->mapping, mapping_, sizeof(mapping_));
   memset(pad->axes, 0, sizeof(pad->axes));
   memset(pad->buttons, 0, sizeof(pad->buttons));
 }
 
 void GamepadProvider::DoPoll() {
-  DCHECK(base::MessageLoop::current() == polling_thread_->message_loop());
+  DCHECK(polling_thread_->task_runner()->BelongsToCurrentThread());
   DCHECK(have_scheduled_do_poll_);
   have_scheduled_do_poll_ = false;
 
   bool changed;
   GamepadHardwareBuffer* hwbuf = SharedMemoryAsHardwareBuffer();
 
   ANNOTATE_BENIGN_RACE_SIZED(
       &hwbuf->buffer,
       sizeof(WebGamepads),
       "Racey reads are discarded");
@@ skipping 31 matching lines @@
     }
   }
 
   CheckForUserGesture();
 
   // Schedule our next interval of polling.
   ScheduleDoPoll();
 }
 
 void GamepadProvider::ScheduleDoPoll() {
-  DCHECK(base::MessageLoop::current() == polling_thread_->message_loop());
+  DCHECK(polling_thread_->task_runner()->BelongsToCurrentThread());
   if (have_scheduled_do_poll_)
     return;
 
   {
     base::AutoLock lock(is_paused_lock_);
     if (is_paused_)
       return;
   }
 
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
@@ skipping 51 matching lines @@
   }
   if (!had_gesture_before && ever_had_user_gesture_) {
     // Initialize pad_states_ for the first time.
     for (size_t i = 0; i < WebGamepads::itemsLengthCap; ++i) {
       pad_states_.get()[i].SetPad(pads.items[i]);
     }
   }
 }
 
 }  // namespace content