Add PurgeMemory() method for ChildMemoryCoordinator.mojom

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 9c3c992990175f6da043a631c5ceeb744b6932f1..5a083ff0ad8b0b6a72391994cc587bec55269196 100644
--- a/content/browser/memory/memory_coordinator_impl_unittest.cc
+++ b/content/browser/memory/memory_coordinator_impl_unittest.cc
@@ -35,7 +35,8 @@ class MockChildMemoryCoordinator : public mojom::ChildMemoryCoordinator {
  public:
   MockChildMemoryCoordinator()
       : state_(mojom::MemoryState::NORMAL),
-        on_state_change_calls_(0) {}
+        on_state_change_calls_(0),
+        purge_memory_calls_(0) {}
 
   ~MockChildMemoryCoordinator() override {}
 
@@ -44,12 +45,16 @@ class MockChildMemoryCoordinator : public mojom::ChildMemoryCoordinator {
     ++on_state_change_calls_;
   }
 
+  void PurgeMemory() override { ++purge_memory_calls_; }
+
   mojom::MemoryState state() const { return state_; }
   int on_state_change_calls() const { return on_state_change_calls_; }
+  int purge_memory_calls() const { return purge_memory_calls_; }
 
  private:
   mojom::MemoryState state_;
   int on_state_change_calls_;
+  int purge_memory_calls_;
 };
 
 // A mock MemoryCoordinatorClient, for testing interaction between MC and
@@ -57,15 +62,15 @@ class MockChildMemoryCoordinator : public mojom::ChildMemoryCoordinator {
 class MockMemoryCoordinatorClient : public base::MemoryCoordinatorClient {
  public:
   void OnMemoryStateChange(base::MemoryState state) override {
-    is_called_ = true;
+    is_state_changed_ = true;

[dcheng, 2017/02/14 07:48:18]

Nit: it reads slightly more smoothly to call this:

did_change_state_

or just

state_changed_

[bashi, 2017/02/14 08:02:35]

Changed to did_state_changed. Thanks for the suggestion!

     state_ = state;
   }
 
-  bool is_called() { return is_called_; }
-  base::MemoryState state() { return state_; }
+  bool is_state_changed() const { return is_state_changed_; }
+  base::MemoryState state() const { return state_; }
 
  private:
-  bool is_called_ = false;
+  bool is_state_changed_ = false;
   base::MemoryState state_ = base::MemoryState::NORMAL;
 };
 
@@ -243,6 +248,14 @@ TEST_F(MemoryCoordinatorImplTest, SetMemoryStateDelivered) {
   EXPECT_EQ(mojom::MemoryState::THROTTLED, cmc2->state());
 }
 
+TEST_F(MemoryCoordinatorImplTest, PurgeMemoryChild) {
+  auto child = coordinator_->CreateChildMemoryCoordinator(1);

[dcheng, 2017/02/14 07:48:18]

Nit: auto*

[bashi, 2017/02/14 08:02:35]

Done.

+  EXPECT_EQ(0, child->purge_memory_calls());
+  child->PurgeMemory();
+  RunUntilIdle();
+  EXPECT_EQ(1, child->purge_memory_calls());
+}
+
 TEST_F(MemoryCoordinatorImplTest, SetChildMemoryState) {
   auto cmc = coordinator_->CreateChildMemoryCoordinator(1);
   auto iter = coordinator_->children().find(1);
@@ -368,7 +381,7 @@ TEST_F(MemoryCoordinatorImplTest, UpdateState) {
     GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(40);
     state_updater->UpdateState();
     RunUntilIdle();
-    EXPECT_TRUE(client.is_called());
+    EXPECT_TRUE(client.is_state_changed());
     EXPECT_EQ(base::MemoryState::THROTTLED, client.state());
     base::MemoryCoordinatorClientRegistry::GetInstance()->Unregister(&client);
   }
@@ -381,7 +394,7 @@ TEST_F(MemoryCoordinatorImplTest, UpdateState) {
     GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(50);
     state_updater->UpdateState();
     RunUntilIdle();
-    EXPECT_FALSE(client.is_called());
+    EXPECT_FALSE(client.is_state_changed());
     EXPECT_EQ(base::MemoryState::NORMAL, client.state());
     base::MemoryCoordinatorClientRegistry::GetInstance()->Unregister(&client);
   }
@@ -422,7 +435,7 @@ TEST_F(MemoryCoordinatorImplTest, SetMemoryStateForTesting) {
             base::MemoryCoordinatorProxy::GetInstance()->
             GetCurrentMemoryState());
   RunUntilIdle();
-  EXPECT_TRUE(client.is_called());
+  EXPECT_TRUE(client.is_state_changed());
   EXPECT_EQ(base::MemoryState::THROTTLED, client.state());
   base::MemoryCoordinatorClientRegistry::GetInstance()->Unregister(&client);
 }