Revert of Aura on Android: content/browser

content/browser/wake_lock/wake_lock_service_context.cc

 // Copyright 2015 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/wake_lock/wake_lock_service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "build/build_config.h"
@@ skipping 47 matching lines @@
 bool WakeLockServiceContext::HasWakeLockForTests() const {
   return !!wake_lock_;
 }
 
 void WakeLockServiceContext::CreateWakeLock() {
   DCHECK(!wake_lock_);
   wake_lock_ = PowerSaveBlocker::Create(
       PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
       PowerSaveBlocker::kReasonOther, "Wake Lock API");
 
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
   // On Android, additionaly associate the blocker with this WebContents.
   DCHECK(web_contents());
 
   static_cast<PowerSaveBlockerImpl*>(wake_lock_.get())
       ->InitDisplaySleepBlocker(web_contents());
 #endif
 }
 
 void WakeLockServiceContext::RemoveWakeLock() {
   DCHECK(wake_lock_);
   wake_lock_.reset();
 }
 
 void WakeLockServiceContext::UpdateWakeLock() {
   if (!frames_requesting_lock_.empty()) {
     if (!wake_lock_)
       CreateWakeLock();
   } else {
     if (wake_lock_)
       RemoveWakeLock();
   }
 }
 
 }  // namespace content