Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

chrome/browser/chromeos/login/login_browsertest.cc

Index: chrome/browser/chromeos/login/login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index bd7b287a889082eb3bad83c6c913bd5954c8eb1e..4d57ef6a3b34b66b10e38e5f8ff073468904322c 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -75,6 +75,12 @@ class LoginSigninTest : public InProcessBrowserTest {
     command_line->AppendSwitch(switches::kForceLoginManagerInTests);
   }
 
+  void TearDownOnMainThread() override {
+    // Close the login manager, which otherwise holds a KeepAlive that is not
+    // cleared in time by the end of the test.
+    LoginDisplayHost::default_host()->Finalize();

[dgn, 2016/03/11 22:15:04]

This is what would need to be added in all the places using the pair of switches
above.

+  }
+
   void SetUpOnMainThread() override {
     LoginDisplayHostImpl::DisableRestrictiveProxyCheckForTest();