Add KeepAliveStateObserver, add the Restart option

chrome/browser/lifetime/keep_alive_registry_unittest.cc

Index: chrome/browser/lifetime/keep_alive_registry_unittest.cc
diff --git a/chrome/browser/lifetime/keep_alive_registry_unittest.cc b/chrome/browser/lifetime/keep_alive_registry_unittest.cc
index acff553929262a4cf596b24511e59cab855f1d94..81e55de3d8e6cf9e21995a7b767b0170701d346f 100644
--- a/chrome/browser/lifetime/keep_alive_registry_unittest.cc
+++ b/chrome/browser/lifetime/keep_alive_registry_unittest.cc
@@ -6,54 +6,116 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/keep_alive_state_observer.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// Test the WillKeepAlive state and when we interact with the browser with
+class KeepAliveRegistryTest : public testing::Test,
+                              public KeepAliveStateObserver {
+ public:
+  KeepAliveRegistryTest()
+      : on_restart_allowed_call_count_(0), on_restart_forbidden_call_count_(0) {
+    registry_ = KeepAliveRegistry::GetInstance();

[sky, 2016/02/26 22:13:25]

nit: use member initialize.

[dgn, 2016/03/09 16:35:31]

Done.

+    registry_->AddObserver(this);
+
+    EXPECT_FALSE(registry_->IsKeepingAlive());
+  }
+  ~KeepAliveRegistryTest() override {
+    registry_->RemoveObserver(this);
+
+    EXPECT_FALSE(registry_->IsKeepingAlive());
+  }
+
+  void OnRestartAllowed() override {
+    ++on_restart_allowed_call_count_;
+  };
+  void OnRestartForbidden() override {
+    ++on_restart_forbidden_call_count_;
+  };
+
+  int on_restart_allowed_call_count_;

[sky, 2016/02/26 22:13:25]

nit: protected.

[dgn, 2016/03/09 16:35:31]

Done.

+  int on_restart_forbidden_call_count_;
+  KeepAliveRegistry* registry_;
+};
+
+// Test the IsKeepingAlive state and when we interact with the browser with
 // a KeepAlive registered.
-TEST(KeepAliveRegistryTest, BasicKeepAliveTest) {
+TEST_F(KeepAliveRegistryTest, BasicKeepAliveTest) {
   const int base_keep_alive_count = chrome::GetKeepAliveCountForTesting();
   KeepAliveRegistry* registry = KeepAliveRegistry::GetInstance();
 
-  EXPECT_FALSE(registry->WillKeepAlive());
+  EXPECT_FALSE(registry->IsKeepingAlive());
 
   {
     // Arbitrarily chosen Origin
-    ScopedKeepAlive test_keep_alive(KeepAliveOrigin::CHROME_APP_DELEGATE);
+    ScopedKeepAlive test_keep_alive(KeepAliveOrigin::CHROME_APP_DELEGATE,
+                                    KeepAliveRestartOption::DISABLED);
 
     // We should require the browser to stay alive
     EXPECT_EQ(base_keep_alive_count + 1, chrome::GetKeepAliveCountForTesting());
-    EXPECT_TRUE(registry->WillKeepAlive());
+    EXPECT_TRUE(registry_->IsKeepingAlive());
   }
 
   // We should be back to normal now.
   EXPECT_EQ(base_keep_alive_count, chrome::GetKeepAliveCountForTesting());
-  EXPECT_FALSE(registry->WillKeepAlive());
+  EXPECT_FALSE(registry_->IsKeepingAlive());
 }
 
-// Test the WillKeepAlive state and when we interact with the browser with
+// Test the IsKeepingAlive state and when we interact with the browser with
 // more than one KeepAlive registered.
-TEST(KeepAliveRegistryTest, DoubleKeepAliveTest) {
+TEST_F(KeepAliveRegistryTest, DoubleKeepAliveTest) {
   const int base_keep_alive_count = chrome::GetKeepAliveCountForTesting();
-  KeepAliveRegistry* registry = KeepAliveRegistry::GetInstance();
   scoped_ptr<ScopedKeepAlive> keep_alive_1, keep_alive_2;
 
-  keep_alive_1.reset(new ScopedKeepAlive(KeepAliveOrigin::CHROME_APP_DELEGATE));
+  keep_alive_1.reset(new ScopedKeepAlive(KeepAliveOrigin::CHROME_APP_DELEGATE,
+                                         KeepAliveRestartOption::DISABLED));
   EXPECT_EQ(base_keep_alive_count + 1, chrome::GetKeepAliveCountForTesting());
-  EXPECT_TRUE(registry->WillKeepAlive());
+  EXPECT_TRUE(registry_->IsKeepingAlive());
 
-  keep_alive_2.reset(new ScopedKeepAlive(KeepAliveOrigin::CHROME_APP_DELEGATE));
+  keep_alive_2.reset(new ScopedKeepAlive(KeepAliveOrigin::CHROME_APP_DELEGATE,
+                                         KeepAliveRestartOption::DISABLED));
   // We should not increment the count twice
   EXPECT_EQ(base_keep_alive_count + 1, chrome::GetKeepAliveCountForTesting());
-  EXPECT_TRUE(registry->WillKeepAlive());
+  EXPECT_TRUE(registry_->IsKeepingAlive());
 
   keep_alive_1.reset();
   // We should not decrement the count before the last keep alive is released.
   EXPECT_EQ(base_keep_alive_count + 1, chrome::GetKeepAliveCountForTesting());
-  EXPECT_TRUE(registry->WillKeepAlive());
+  EXPECT_TRUE(registry_->IsKeepingAlive());
 
   keep_alive_2.reset();
   EXPECT_EQ(base_keep_alive_count, chrome::GetKeepAliveCountForTesting());
-  EXPECT_FALSE(registry->WillKeepAlive());
+  EXPECT_FALSE(registry_->IsKeepingAlive());
+}
+
+// Test the IsKeepingAlive state and when we interact with the browser with
+// more than one KeepAlive registered.
+TEST_F(KeepAliveRegistryTest, RestartOptionTest) {
+  scoped_ptr<ScopedKeepAlive> keep_alive, keep_alive_restart;
+
+  EXPECT_EQ(0, on_restart_allowed_call_count_);
+  EXPECT_EQ(0, on_restart_forbidden_call_count_);
+
+  // With a normal keep alive, restart should not be allowed
+  keep_alive.reset(new ScopedKeepAlive(KeepAliveOrigin::CHROME_APP_DELEGATE,
+                                       KeepAliveRestartOption::DISABLED));
+  ASSERT_EQ(1, on_restart_forbidden_call_count_--);  // decrement to ack
+
+  // Restart should not be allowed if all KA don't allow it.
+  keep_alive_restart.reset(new ScopedKeepAlive(
+      KeepAliveOrigin::CHROME_APP_DELEGATE, KeepAliveRestartOption::ENABLED));
+  EXPECT_EQ(0, on_restart_allowed_call_count_);
+
+  // Now restart should be allowed, the only one left allows it.
+  keep_alive.reset();
+  ASSERT_EQ(1, on_restart_allowed_call_count_--);
+
+  // No keep alive, we should no prevent restarts.
+  keep_alive.reset();
+  EXPECT_EQ(0, on_restart_forbidden_call_count_);
+
+  // Make sure all calls were checked.
+  EXPECT_EQ(0, on_restart_allowed_call_count_);
+  EXPECT_EQ(0, on_restart_forbidden_call_count_);
 }