Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 0 insertions, 37 deletions

diff --git a/chrome/browser/chromeos/cros/screen_lock_library.cc b/chrome/browser/chromeos/cros/screen_lock_library.cc
index 3502c26..cd01302 100644
--- a/chrome/browser/chromeos/cros/screen_lock_library.cc
+++ b/chrome/browser/chromeos/cros/screen_lock_library.cc
@@ -35,54 +35,18 @@ class ScreenLockLibraryImpl : public ScreenLockLibrary {
   }
 
   void NotifyScreenLockRequested() {
-    // Make sure we run on IO thread.
-    if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              this,
-              &ScreenLockLibraryImpl::NotifyScreenLockRequested));
-      return;
-    }
     chromeos::NotifyScreenLockRequested();
   }
 
   void NotifyScreenLockCompleted() {
-    // Make sure we run on IO thread.
-    if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              this,
-              &ScreenLockLibraryImpl::NotifyScreenLockCompleted));
-      return;
-    }
     chromeos::NotifyScreenLockCompleted();
   }
 
   void NotifyScreenUnlockRequested() {
-    // Make sure we run on IO thread.
-    if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              this,
-              &ScreenLockLibraryImpl::NotifyScreenUnlockRequested));
-      return;
-    }
     chromeos::NotifyScreenUnlockRequested();
   }
 
   void NotifyScreenUnlockCompleted() {
-    // Make sure we run on IO thread.
-    if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-      BrowserThread::PostTask(
-          BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(
-              this,
-              &ScreenLockLibraryImpl::NotifyScreenUnlockCompleted));
-      return;
-    }
     chromeos::NotifyScreenUnlockCompleted();
   }
 
@@ -175,4 +139,3 @@ ScreenLockLibrary* ScreenLockLibrary::GetImpl(bool stub) {
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::ScreenLockLibraryImpl);
-