Revert of Multiprocess test client: Android child process launcher rework.

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/memory/memory_coordinator_client_registry.h"
 #include "base/memory/memory_coordinator_proxy.h"
 #include "base/memory/memory_pressure_monitor.h"
 #include "base/memory/ptr_util.h"
@@ skipping 455 matching lines @@
 
   // Also make sure that the state is updated based on free avaiable memory.
   // Since the global state has changed in the previous task, we have to wait
   // for |minimum_transition|.
   GetMockMemoryMonitor()->SetFreeMemoryUntilCriticalMB(40);
   task_runner_->FastForwardBy(minimum_transition);
   task_runner_->RunUntilIdle();
   EXPECT_EQ(base::MemoryState::THROTTLED, coordinator_->GetGlobalMemoryState());
 }
 
-
-#if defined(OS_ANDROID)
-// TODO(jcivelli): Broken on Android. http://crbug.com/678665
-#define MAYBE_GetStateForProcess DISABLED_GetStateForProcess
-#else
-#define MAYBE_GetStateForProcess GetStateForProcess
-#endif
-TEST_F(MemoryCoordinatorImplTest, MAYBE_GetStateForProcess) {
+TEST_F(MemoryCoordinatorImplTest, GetStateForProcess) {
   EXPECT_EQ(base::MemoryState::UNKNOWN,
             coordinator_->GetStateForProcess(base::kNullProcessHandle));
   EXPECT_EQ(base::MemoryState::NORMAL,
             coordinator_->GetStateForProcess(base::GetCurrentProcessHandle()));
 
   coordinator_->CreateChildMemoryCoordinator(1);
   coordinator_->CreateChildMemoryCoordinator(2);
   base::Process process1 = SpawnChild("process1");
   base::Process process2 = SpawnChild("process2");
   coordinator_->GetMockRenderProcessHost(1)->SetProcessHandle(
       base::MakeUnique<base::ProcessHandle>(process1.Handle()));
   coordinator_->GetMockRenderProcessHost(2)->SetProcessHandle(
       base::MakeUnique<base::ProcessHandle>(process2.Handle()));
 
   EXPECT_EQ(base::MemoryState::NORMAL,
             coordinator_->GetStateForProcess(process1.Handle()));
   EXPECT_EQ(base::MemoryState::NORMAL,
             coordinator_->GetStateForProcess(process2.Handle()));
 
   EXPECT_TRUE(
       coordinator_->SetChildMemoryState(1, MemoryState::THROTTLED));
   EXPECT_EQ(base::MemoryState::THROTTLED,
             coordinator_->GetStateForProcess(process1.Handle()));
   EXPECT_EQ(base::MemoryState::NORMAL,
             coordinator_->GetStateForProcess(process2.Handle()));
 }
 
 }  // namespace content