Removes MessageLoop::Type checks in favor of IsCurrent on MessageLoops.

chrome/browser/chromeos/login/screen_locker.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/chromeos/login/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 229 matching lines @@
   // for sure.
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ScreenLocker::UnlockOnLoginSuccess,
           weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kUnlockGuardTimeoutMs));
   delegate_->AnimateAuthenticationSuccess();
 }
 
 void ScreenLocker::UnlockOnLoginSuccess() {
-  DCHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
+  DCHECK(base::MessageLoopForUI::IsCurrent());
   if (!authentication_capture_.get()) {
     LOG(WARNING) << "Call to UnlockOnLoginSuccess without previous " <<
       "authentication success.";
     return;
   }
 
   if (login_status_consumer_) {
     login_status_consumer_->OnLoginSuccess(
         UserContext(authentication_capture_->user_context.username,
                     authentication_capture_->user_context.password,
@@ skipping 71 matching lines @@
 }
 
 void ScreenLocker::SetLoginStatusConsumer(
     chromeos::LoginStatusConsumer* consumer) {
   login_status_consumer_ = consumer;
 }
 
 // static
 void ScreenLocker::Show() {
   content::RecordAction(UserMetricsAction("ScreenLocker_Show"));
-  DCHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
+  DCHECK(base::MessageLoopForUI::IsCurrent());
 
   // Check whether the currently logged in user is a guest account and if so,
   // refuse to lock the screen (crosbug.com/23764).
   // For a demo user, we should never show the lock screen (crosbug.com/27647).
   if (UserManager::Get()->IsLoggedInAsGuest() ||
       UserManager::Get()->IsLoggedInAsDemoUser()) {
     VLOG(1) << "Refusing to lock screen for guest/demo account";
     return;
   }
 
@@ skipping 16 matching lines @@
   } else {
     VLOG(1) << "ScreenLocker " << screen_locker_ << " already exists; "
             << " calling session manager's HandleLockScreenShown D-Bus method";
     DBusThreadManager::Get()->GetSessionManagerClient()->
         NotifyLockScreenShown();
   }
 }
 
 // static
 void ScreenLocker::Hide() {
-  DCHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
+  DCHECK(base::MessageLoopForUI::IsCurrent());
   // For a guest/demo user, screen_locker_ would have never been initialized.
   if (UserManager::Get()->IsLoggedInAsGuest() ||
       UserManager::Get()->IsLoggedInAsDemoUser()) {
     VLOG(1) << "Refusing to hide lock screen for guest/demo account";
     return;
   }
 
   DCHECK(screen_locker_);
   base::Callback<void(void)> callback =
       base::Bind(&ScreenLocker::ScheduleDeletion);
@@ skipping 16 matching lines @@
 // static
 void ScreenLocker::InitClass() {
   g_screen_lock_observer.Get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ScreenLocker, private:
 
 ScreenLocker::~ScreenLocker() {
   VLOG(1) << "Destroying ScreenLocker " << this;
-  DCHECK(base::MessageLoop::current()->type() == base::MessageLoop::TYPE_UI);
+  DCHECK(base::MessageLoopForUI::IsCurrent());
 
   if (authenticator_.get())
     authenticator_->SetConsumer(NULL);
   ClearErrors();
 
   VLOG(1) << "Moving desktop background to unlocked container";
   ash::Shell::GetInstance()->
       desktop_background_controller()->MoveDesktopToUnlockedContainer();
 
   screen_locker_ = NULL;
@@ skipping 39 matching lines @@
 
 bool ScreenLocker::IsUserLoggedIn(const std::string& username) {
   for (UserList::const_iterator it = users_.begin(); it != users_.end(); ++it) {
     if ((*it)->email() == username)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos