Introduce MemoryCoordinatorProxy in base

content/browser/memory/memory_coordinator_impl_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/memory/memory_coordinator_impl.h"
 
+#include "base/feature_list.h"
+#include "base/memory/memory_coordinator_proxy.h"
 #include "base/run_loop.h"
 #include "content/browser/memory/memory_monitor.h"
+#include "content/public/common/content_features.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 class MockMemoryCoordinatorClient : public base::MemoryCoordinatorClient {
  public:
   void OnMemoryStateChange(base::MemoryState state) override {
     is_called_ = true;
@@ skipping 24 matching lines @@
 
  private:
   int free_memory_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(MockMemoryMonitor);
 };
 
 class MemoryCoordinatorImplTest : public testing::Test {
  public:
   void SetUp() override {
+    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);

[bashi, 2016/10/24 00:10:25]

nit: Can we move out EnableForTesting() in memory_coordinator_browser_test.cc to
a separate file and use it here?

[hajimehoshi, 2016/10/24 06:51:06]

Done.

+    feature_list->InitializeFromCommandLine(features::kMemoryCoordinator.name,
+                                            "");
+    base::FeatureList::ClearInstanceForTesting();
+    base::FeatureList::SetInstance(std::move(feature_list));
+
     coordinator_.reset(new MemoryCoordinatorImpl(
         message_loop_.task_runner(), base::WrapUnique(new MockMemoryMonitor)));
+
+    base::MemoryCoordinatorProxy::GetInstance()->
+        SetGetCurrentMemoryStateCallback(base::Bind(
+            &MemoryCoordinator::GetCurrentMemoryState,
+            base::Unretained(coordinator_.get())));
   }
 
   MockMemoryMonitor* GetMockMemoryMonitor() {
     return static_cast<MockMemoryMonitor*>(coordinator_->memory_monitor());
   }
 
  protected:
   std::unique_ptr<MemoryCoordinatorImpl> coordinator_;
   base::MessageLoop message_loop_;
 };
 
 TEST_F(MemoryCoordinatorImplTest, CalculateNextState) {
   coordinator_->expected_renderer_size_ = 10;
   coordinator_->new_renderers_until_throttled_ = 4;
   coordinator_->new_renderers_until_suspended_ = 2;
   coordinator_->new_renderers_back_to_normal_ = 5;
   coordinator_->new_renderers_back_to_throttled_ = 3;
   DCHECK(coordinator_->ValidateParameters());
 
   // The default state is NORMAL.
   EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::NORMAL,
+            base::MemoryCoordinatorProxy::GetInstance()->
+                GetCurrentMemoryState());
 
   // Transitions from NORMAL
   coordinator_->current_state_ = base::MemoryState::NORMAL;
   EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::NORMAL,
+            base::MemoryCoordinatorProxy::GetInstance()->
+                GetCurrentMemoryState());
+
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(50);
   EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->CalculateNextState());
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(40);
   EXPECT_EQ(base::MemoryState::THROTTLED, coordinator_->CalculateNextState());
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(20);
   EXPECT_EQ(base::MemoryState::SUSPENDED, coordinator_->CalculateNextState());
 
   // Transitions from THROTTLED
   coordinator_->current_state_ = base::MemoryState::THROTTLED;
   EXPECT_EQ(base::MemoryState::THROTTLED,
             coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::THROTTLED,
+            base::MemoryCoordinatorProxy::GetInstance()->
+                GetCurrentMemoryState());
+
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(40);
   EXPECT_EQ(base::MemoryState::THROTTLED, coordinator_->CalculateNextState());
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(50);
   EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->CalculateNextState());
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(20);
   EXPECT_EQ(base::MemoryState::SUSPENDED, coordinator_->CalculateNextState());
 
   // Transitions from SUSPENDED
   coordinator_->current_state_ = base::MemoryState::SUSPENDED;
   EXPECT_EQ(base::MemoryState::SUSPENDED,
             coordinator_->GetCurrentMemoryState());
+  EXPECT_EQ(base::MemoryState::SUSPENDED,
+            base::MemoryCoordinatorProxy::GetInstance()->
+                GetCurrentMemoryState());
+
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(20);
   EXPECT_EQ(base::MemoryState::SUSPENDED, coordinator_->CalculateNextState());
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(30);
   EXPECT_EQ(base::MemoryState::THROTTLED, coordinator_->CalculateNextState());
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(50);
   EXPECT_EQ(base::MemoryState::NORMAL, coordinator_->CalculateNextState());
 }
 
 TEST_F(MemoryCoordinatorImplTest, UpdateState) {
   coordinator_->expected_renderer_size_ = 10;
@@ skipping 26 matching lines @@
     coordinator_->UpdateState();
     base::RunLoop loop;
     loop.RunUntilIdle();
     EXPECT_FALSE(client.is_called());
     EXPECT_EQ(base::MemoryState::NORMAL, client.state());
     base::MemoryCoordinatorClientRegistry::GetInstance()->Unregister(&client);
   }
 }
 
 }  // namespace content