Stop using callbacks in MemoryCoordinatorProxy

content/browser/memory/memory_coordinator_impl_unittest.cc

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 785de0482c9c6ec8d31d1a21b180ee9b00474eec..ced7432f91e84fd4b559761daed83f625cc21bc6 100644
--- a/content/browser/memory/memory_coordinator_impl_unittest.cc
+++ b/content/browser/memory/memory_coordinator_impl_unittest.cc
@@ -60,14 +60,8 @@ class MemoryCoordinatorImplTest : public testing::Test {
     coordinator_.reset(new MemoryCoordinatorImpl(
         task_runner_, base::WrapUnique(new MockMemoryMonitor)));
 
-    base::MemoryCoordinatorProxy::GetInstance()->
-        SetGetCurrentMemoryStateCallback(base::Bind(
-            &MemoryCoordinator::GetCurrentMemoryState,
-            base::Unretained(coordinator_.get())));
-    base::MemoryCoordinatorProxy::GetInstance()->
-        SetSetCurrentMemoryStateForTestingCallback(base::Bind(
-            &MemoryCoordinator::SetCurrentMemoryStateForTesting,
-            base::Unretained(coordinator_.get())));
+    base::MemoryCoordinatorProxy::GetInstance()->Set(
+        coordinator_->GetWeakPtr());
   }
 
   MockMemoryMonitor* GetMockMemoryMonitor() {
@@ -90,17 +84,17 @@ TEST_F(MemoryCoordinatorImplTest, CalculateNextState) {
   DCHECK(coordinator_->ValidateParameters());
 
   // The default state is NORMAL.
-  EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::NORMAL,
             base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+                GetLocalMemoryState());
 
   // Transitions from NORMAL
   coordinator_->current_state_ = base::MemoryState::NORMAL;
-  EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::NORMAL,
             base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+                GetLocalMemoryState());
 
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(50);
   EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->CalculateNextState());
@@ -112,10 +106,10 @@ TEST_F(MemoryCoordinatorImplTest, CalculateNextState) {
   // Transitions from THROTTLED
   coordinator_->current_state_ = base::MemoryState::THROTTLED;
   EXPECT_EQ(base::MemoryState::THROTTLED,
-            coordinator_->GetCurrentMemoryState());
+            coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::THROTTLED,
             base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+                GetLocalMemoryState());
 
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(40);
   EXPECT_EQ(base::MemoryState::THROTTLED, coordinator_->CalculateNextState());
@@ -126,13 +120,13 @@ TEST_F(MemoryCoordinatorImplTest, CalculateNextState) {
 
   // Transitions from SUSPENDED
   coordinator_->current_state_ = base::MemoryState::SUSPENDED;
-  // GetCurrentMemoryState() returns THROTTLED state for the browser process
+  // GetLocalMemoryState() returns THROTTLED state for the browser process
   // when the global state is SUSPENDED.
   EXPECT_EQ(base::MemoryState::THROTTLED,
-            coordinator_->GetCurrentMemoryState());
+            coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::THROTTLED,
             base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+                GetLocalMemoryState());
 
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(20);
   EXPECT_EQ(base::MemoryState::SUSPENDED, coordinator_->CalculateNextState());
@@ -189,29 +183,26 @@ TEST_F(MemoryCoordinatorImplTest, SetMemoryStateForTesting) {
 
   MockMemoryCoordinatorClient client;
   base::MemoryCoordinatorClientRegistry::GetInstance()->Register(&client);
-  EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::NORMAL,
-            base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+            base::MemoryCoordinatorProxy::GetInstance()->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::NORMAL, client.state());
 
-  base::MemoryCoordinatorProxy::GetInstance()->SetCurrentMemoryStateForTesting(
+  base::MemoryCoordinatorProxy::GetInstance()->SetMemoryStateForTesting(
       base::MemoryState::SUSPENDED);
-  // GetCurrentMemoryState() returns THROTTLED state for the browser process
+  // GetLocalMemoryState() returns THROTTLED state for the browser process
   // when the global state is SUSPENDED.
   EXPECT_EQ(base::MemoryState::THROTTLED,
-            coordinator_->GetCurrentMemoryState());
+            coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::THROTTLED,
-            base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+            base::MemoryCoordinatorProxy::GetInstance()->GetLocalMemoryState());
 
-  base::MemoryCoordinatorProxy::GetInstance()->SetCurrentMemoryStateForTesting(
+  base::MemoryCoordinatorProxy::GetInstance()->SetMemoryStateForTesting(
       base::MemoryState::THROTTLED);
   EXPECT_EQ(base::MemoryState::THROTTLED,
-            coordinator_->GetCurrentMemoryState());
+            coordinator_->GetLocalMemoryState());
   EXPECT_EQ(base::MemoryState::THROTTLED,
-            base::MemoryCoordinatorProxy::GetInstance()->
-                GetCurrentMemoryState());
+            base::MemoryCoordinatorProxy::GetInstance()->GetLocalMemoryState());
   base::RunLoop loop;
   loop.RunUntilIdle();
   EXPECT_TRUE(client.is_called());