Device Service: Decouple Wake Lock from //content

content/browser/wake_lock/wake_lock_browsertest.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 "base/command_line.h"
 #include "base/test/test_timeouts.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test_utils_internal.h"
-#include "device/wake_lock/wake_lock_service_context.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace content {
 
 namespace {
 
 const char kBlinkWakeLockFeature[] = "WakeLock";
 
+void OnHasWakeLock(bool* out, bool has_wakelock) {
+  *out = has_wakelock;
+  base::MessageLoop::current()->QuitNow();
+}
+
 }  // namespace
 
 class WakeLockTest : public ContentBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kEnableBlinkFeatures,
                                     kBlinkWakeLockFeature);
     command_line->AppendSwitch(switches::kSitePerProcess);
   }
 
@@ skipping 20 matching lines @@
   FrameTreeNode* GetNestedFrameNode() {
     FrameTreeNode* root = GetWebContentsImpl()->GetFrameTree()->root();
     CHECK_EQ(1U, root->child_count());
     return root->child_at(0);
   }
 
   RenderFrameHost* GetNestedFrame() {
     return GetNestedFrameNode()->current_frame_host();
   }
 
-  device::WakeLockServiceContext* GetWakeLockServiceContext() {
+  device::mojom::WakeLockContext* GetWakeLockServiceContext() {
     return GetWebContentsImpl()->GetWakeLockServiceContext();
   }
 
   bool HasWakeLock() {
-    return GetWakeLockServiceContext()->HasWakeLockForTests();
+    bool has_wakelock = false;
+    base::RunLoop run_loop;
+    base::Closure quit_closure = run_loop.QuitClosure();

[dcheng, 2017/03/17 06:55:25]

Nit: this appears unused.

[blundell, 2017/03/17 12:28:21]

Done.

+
+    GetWakeLockServiceContext()->HasWakeLockForTests(
+        base::Bind(&OnHasWakeLock, &has_wakelock));
+    run_loop.Run();
+    return has_wakelock;
   }
 
   void WaitForPossibleUpdate() {
     // As Mojo channels have no common FIFO order in respect to each other and
     // to the Chromium IPC, we cannot assume that when screen.keepAwake state
     // is changed from within a script, mojom::WakeLockService will receive an
     // update request before ExecuteScript() returns. Therefore, some time slack
     // is needed to make sure that mojom::WakeLockService has received any
     // possible update requests before checking the resulting wake lock state.
     base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
@@ skipping 286 matching lines @@
       GetNestedFrame()->GetProcess(),
       RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
   GetNestedFrame()->GetProcess()->Shutdown(0, false);
   watcher.Wait();
 
   // Screen wake lock should be released.
   EXPECT_FALSE(HasWakeLock());
 }
 
 }  // namespace content