Make ScreenWakeLock ContextLifecycleObserver instead of LocalFrameLifecycleObserver

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/wake_lock/wake_lock_service_context.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"
@@ skipping 243 matching lines @@
       embedded_test_server()->GetURL("/session_history/fragment.html"));
   GURL test_in_page_url(test_url.spec() + "#a");
 
   NavigateToURL(shell(), test_url);
   ScreenWakeLockInMainFrame();
 
   NavigateToURL(shell(), test_in_page_url);
   EXPECT_TRUE(HasWakeLock());
 }
 
-IN_PROC_BROWSER_TEST_F(WakeLockTest, UnlockAfterReload) {

[haraken, 2016/07/06 08:27:39]

This test is testing if the wake lock is gone after didCommitLoad is called.
We're replacing didCommitLoad with contextDestroyed, so the test doesn't make
sense.

[dcheng, 2016/07/06 08:34:42]

Hmm, isn't this still a useful thing to test? It's obvious if you look at the
code, but it's not bad to explicitly check this expectation in a test too.

[haraken, 2016/07/06 08:51:23]

Reload + WaitForLoadStop doesn't detach a document, so with this CL, the line
272 fails.

On the other hand, NavigateToURL detaches a document, so
UnlockAfterNavigationToSelf etc passes.

[alogvinov, 2016/07/06 08:58:58]

Is the problem that we are waiting for the wrong event, i.e. load stop vs
something that occurs later and does detach the document, or is the document not
detached at all during reload, so that wake lock is still true after reload?

[dcheng, 2016/07/06 09:04:12]

Assuming this is doing a "real" reload, the document should definitely be
detached.

As a quick sanity check:
- Is shell()->web_contents()->IsLoading() true after the Reload() call?
- Does WaitForLoadStop return true?

[haraken, 2016/07/06 09:14:35]

shell()->Reload();
fprintf(stderr, "%d\n", shell()->web_contents()->IsLoading());  // true
fprintf(stderr, "%d\n", WaitForLoadStop(GetWebContents()));  // true
fprintf(stderr, "%d\n", shell()->web_contents()->IsLoading());  // false
WaitForPossibleUpdate();  // Even after this call, Document::detach is not
called...

-  NavigateToURL(shell(), embedded_test_server()->GetURL("/simple_page.html"));
-  ScreenWakeLockInMainFrame();
-
-  shell()->Reload();
-  WaitForLoadStop(GetWebContents());
-
-  // Screen wake lock should be released after reload.
-  EXPECT_FALSE(HasWakeLock());
-}
-
 IN_PROC_BROWSER_TEST_F(WakeLockTest, BrowserInitiatedFrameNavigation) {
   NavigateToURL(shell(),
                 embedded_test_server()->GetURL("/frame_tree/2-4.html"));
 
   EXPECT_FALSE(HasWakeLock());
 
   // Lock screen in nested frame.
   EXPECT_TRUE(ExecuteScript(GetNestedFrame(), "screen.keepAwake = true;"));
   WaitForPossibleUpdate();
 
@@ skipping 82 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