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"
 
 namespace device {
 
 WakeLockServiceImpl::WakeLockServiceImpl(
     mojom::WakeLockServiceRequest request,
-    device::PowerSaveBlocker::PowerSaveBlockerType type,
-    device::PowerSaveBlocker::Reason reason,
+    mojom::WakeLockType type,
+    mojom::WakeLockReason reason,
     const std::string& description,
     int context_id,
     WakeLockContextCallback native_view_getter,
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
     : type_(type),
       reason_(reason),
       description_(base::MakeUnique<std::string>(description)),
       num_lock_requests_(0),
 #if defined(OS_ANDROID)
       context_id_(context_id),
@@ skipping 54 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();
+  // TODO(heke): Remove below static_cast, and switch PowerSaveBlocker to use
+  // mojom::WakeLockType and mojom::WakeLockReason once all its clients are
+  // converted to be the clients of WakeLock.
+
+  // It is safe to static_cast because the definition of mojom::WakeLockType
+  // and mojom::WakeLockReason are just copied from
+  // PowerSaveBlocker::PowerSaveBlockerType and PowerSaveBlocker::Reason.
+  PowerSaveBlocker::PowerSaveBlockerType type =
+      static_cast<PowerSaveBlocker::PowerSaveBlockerType>(type_);

[blundell, 2017/05/10 10:05:11]

hmm, I think it would be safer to explicitly do the conversion case-by-case even
thought that's slightly tedious.

[ke.he, 2017/05/10 13:12:03]

Done.

+  PowerSaveBlocker::Reason reason =
+      static_cast<PowerSaveBlocker::Reason>(reason_);
+
+  wake_lock_ = base::MakeUnique<PowerSaveBlocker>(
+      type, reason, *description_, main_task_runner_, file_task_runner_);
+
+  if (type != PowerSaveBlocker::PowerSaveBlockerType::
+                  kPowerSaveBlockPreventDisplaySleep)
     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_);
   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