| Index: content/browser/memory/memory_coordinator_impl_unittest.cc
|
| diff --git a/content/browser/memory/memory_coordinator_impl_unittest.cc b/content/browser/memory/memory_coordinator_impl_unittest.cc
|
| index dd12e5526cd44bb02a5c049a79633cddf85a1b38..9a63c0ef773b308a7e32dc04fe5a012f80a42d63 100644
|
| --- a/content/browser/memory/memory_coordinator_impl_unittest.cc
|
| +++ b/content/browser/memory/memory_coordinator_impl_unittest.cc
|
| @@ -120,9 +120,11 @@ TEST_F(MemoryCoordinatorImplTest, CalculateNextState) {
|
|
|
| // Transitions from SUSPENDED
|
| coordinator_->current_state_ = base::MemoryState::SUSPENDED;
|
| - EXPECT_EQ(base::MemoryState::SUSPENDED,
|
| + // GetCurrentMemoryState() returns THROTTLED state for the browser process
|
| + // when the global state is SUSPENDED.
|
| + EXPECT_EQ(base::MemoryState::THROTTLED,
|
| coordinator_->GetCurrentMemoryState());
|
| - EXPECT_EQ(base::MemoryState::SUSPENDED,
|
| + EXPECT_EQ(base::MemoryState::THROTTLED,
|
| base::MemoryCoordinatorProxy::GetInstance()->
|
| GetCurrentMemoryState());
|
|
|
| @@ -188,6 +190,16 @@ TEST_F(MemoryCoordinatorImplTest, SetMemoryStateForTesting) {
|
| EXPECT_EQ(base::MemoryState::NORMAL, client.state());
|
|
|
| base::MemoryCoordinatorProxy::GetInstance()->SetCurrentMemoryStateForTesting(
|
| + base::MemoryState::SUSPENDED);
|
| + // GetCurrentMemoryState() returns THROTTLED state for the browser process
|
| + // when the global state is SUSPENDED.
|
| + EXPECT_EQ(base::MemoryState::THROTTLED,
|
| + coordinator_->GetCurrentMemoryState());
|
| + EXPECT_EQ(base::MemoryState::THROTTLED,
|
| + base::MemoryCoordinatorProxy::GetInstance()->
|
| + GetCurrentMemoryState());
|
| +
|
| + base::MemoryCoordinatorProxy::GetInstance()->SetCurrentMemoryStateForTesting(
|
| base::MemoryState::THROTTLED);
|
| EXPECT_EQ(base::MemoryState::THROTTLED,
|
| coordinator_->GetCurrentMemoryState());
|
|
|