Generalize the API of WakeLockContext mojo interface.

device/wake_lock/wake_lock_service_impl.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 "device/wake_lock/wake_lock_service_impl.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 
@@ skipping 70 matching lines @@
       CreateWakeLock();
   } else {
     if (wake_lock_)
       RemoveWakeLock();
   }
 }
 
 void WakeLockServiceImpl::CreateWakeLock() {
   DCHECK(!wake_lock_);
 
-  if (type_ != device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep ||
-      reason_ != device::PowerSaveBlocker::kReasonOther ||
-      *description_ != "Wake Lock API") {
-    // TODO(ke.he@intel.com): Fully generalize the WakeLock interface and impl.
-    NOTREACHED();
-    return;
-  }
-
   wake_lock_ = base::MakeUnique<device::PowerSaveBlocker>(
       type_, reason_, *description_, main_task_runner_, file_task_runner_);
 
 #if defined(OS_ANDROID)
   gfx::NativeView native_view = native_view_getter_.Run(context_id_);

[blundell, 2017/05/09 15:53:24]

Hmm. This code currently only executes at some usage sites of PowerSaveBlocker.
However, with this change, we would be executing it unconditionally. What is the
right guard to avoid this change in behavior? Is it that this code should only
execute if the type is PreventDisplaySleep?

[ke.he, 2017/05/10 07:00:20]

Oh, Thanks pointing out this! I'm sorry.
I found there are two clients executing this InitDisplaySleepBlocker(), one is
MediaWebContentsObserver::video_power_save_blocker_, another is
RenderFrameDevToolsAgentHost::power_save_blocker_. Both of them are requesting
|kPowerSaveBlockPreventDisplaySleep| type. So yes this code should only execute
for PreventDisplaySleep type.

Done.

   if (native_view)
     wake_lock_.get()->InitDisplaySleepBlocker(native_view);
 #endif
 }
 
 void WakeLockServiceImpl::RemoveWakeLock() {
   DCHECK(wake_lock_);
   wake_lock_.reset();
 }
 
 void WakeLockServiceImpl::OnConnectionError() {
   DCHECK(binding_set_.dispatch_context());
 
   // If the error-happening client's wakelock is in outstanding status,
   // decrease the num_lock_requests and call UpdateWakeLock().
   if (*binding_set_.dispatch_context() && num_lock_requests_ > 0) {
     num_lock_requests_--;
     UpdateWakeLock();
   }
 
   // If |binding_set_| is empty, WakeLockServiceImpl should delele itself.
   if (binding_set_.empty())
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 }  // namespace device