Unfreeze tabs that receive WebLock or IndexedDB locks

Bug: 980533
Change-Id: I3c4f1e12e048ba953500d8f7173220e04da997ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856879
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Commit-Queue: François Doray <fdoray@chromium.org>
Reviewed-by: François Doray <fdoray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705224}

chrome/browser/resource_coordinator/tab_lifecycle_unit.cc

@@ -425,11 +425,18 @@ void TabLifecycleUnitSource::TabLifecycleUnit::UpdateOriginTrialFreezePolicy(
 
 void TabLifecycleUnitSource::TabLifecycleUnit::SetIsHoldingWebLock(
     bool is_holding_weblock) {
+  // Unfreeze the tab if it receive a lock while being frozen.
+  if (is_holding_weblock && IsFrozenOrPendingFreeze(GetState()))
+    Unfreeze();
+
   is_holding_weblock_ = is_holding_weblock;
 }
 
 void TabLifecycleUnitSource::TabLifecycleUnit::SetIsHoldingIndexedDBLock(
     bool is_holding_indexeddb_lock) {
+  // Unfreeze the tab if it receive a lock while being frozen.
+  if (is_holding_indexeddb_lock && IsFrozenOrPendingFreeze(GetState()))
+    Unfreeze();
   is_holding_indexeddb_lock_ = is_holding_indexeddb_lock;
 }
 

chrome/browser/resource_coordinator/tab_lifecycle_unit_unittest.cc

@@ -995,4 +995,62 @@ TEST_F(TabLifecycleUnitTest, CannotFreezeIfHoldingIndexedDBLock) {
   tab_lifecycle_unit.SetIsHoldingIndexedDBLock(false);
 }
 
+TEST_F(TabLifecycleUnitTest, TabUnfreezeOnWebLockAcquisition) {
+  TabLifecycleUnit tab_lifecycle_unit(GetTabLifecycleUnitSource(), &observers_,
+                                      usage_clock_.get(), web_contents_,
+                                      tab_strip_model_.get());
+  TabLoadTracker::Get()->TransitionStateForTesting(web_contents_,
+                                                   LoadingState::LOADED);
+  // Advance time enough that the tab is urgent discardable.
+  test_clock_.Advance(kBackgroundUrgentProtectionTime);
+  ExpectCanDiscardTrueAllReasons(&tab_lifecycle_unit);
+
+  DecisionDetails decision_details;
+  EXPECT_TRUE(tab_lifecycle_unit.CanFreeze(&decision_details));
+
+  // Freeze the tab.
+  EXPECT_CALL(observer_, OnFrozenStateChange(web_contents_, true));
+  tab_lifecycle_unit.Freeze();
+  ::testing::Mock::VerifyAndClear(&observer_);
+  EXPECT_EQ(LifecycleUnitState::PENDING_FREEZE, tab_lifecycle_unit.GetState());
+
+  // Indicates that the tab has acquired a WebLock, this should unfreeze it.
+  EXPECT_CALL(observer_, OnFrozenStateChange(web_contents_, false));
+  tab_lifecycle_unit.SetIsHoldingWebLock(true);
+  ::testing::Mock::VerifyAndClear(&observer_);
+  EXPECT_EQ(LifecycleUnitState::PENDING_UNFREEZE,
+            tab_lifecycle_unit.GetState());
+
+  tab_lifecycle_unit.SetIsHoldingWebLock(false);
+}
+
+TEST_F(TabLifecycleUnitTest, TabUnfreezeOnIndexedDBLockAcquisition) {
+  TabLifecycleUnit tab_lifecycle_unit(GetTabLifecycleUnitSource(), &observers_,
+                                      usage_clock_.get(), web_contents_,
+                                      tab_strip_model_.get());
+  TabLoadTracker::Get()->TransitionStateForTesting(web_contents_,
+                                                   LoadingState::LOADED);
+  // Advance time enough that the tab is urgent discardable.
+  test_clock_.Advance(kBackgroundUrgentProtectionTime);
+  ExpectCanDiscardTrueAllReasons(&tab_lifecycle_unit);
+
+  DecisionDetails decision_details;
+  EXPECT_TRUE(tab_lifecycle_unit.CanFreeze(&decision_details));
+
+  // Freeze the tab.
+  EXPECT_CALL(observer_, OnFrozenStateChange(web_contents_, true));
+  tab_lifecycle_unit.Freeze();
+  ::testing::Mock::VerifyAndClear(&observer_);
+  EXPECT_EQ(LifecycleUnitState::PENDING_FREEZE, tab_lifecycle_unit.GetState());
+
+  // Indicates that the tab has acquired a WebLock, this should unfreeze it.
+  EXPECT_CALL(observer_, OnFrozenStateChange(web_contents_, false));
+  tab_lifecycle_unit.SetIsHoldingIndexedDBLock(true);
+  ::testing::Mock::VerifyAndClear(&observer_);
+  EXPECT_EQ(LifecycleUnitState::PENDING_UNFREEZE,
+            tab_lifecycle_unit.GetState());
+
+  tab_lifecycle_unit.SetIsHoldingIndexedDBLock(false);
+}
+
 }  // namespace resource_coordinator