| 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..795d18b562f67d43b7ed8c635855f3da3625cece 100644
|
| --- a/content/browser/memory/memory_coordinator_impl_unittest.cc
|
| +++ b/content/browser/memory/memory_coordinator_impl_unittest.cc
|
| @@ -473,14 +473,7 @@
|
| 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,
|
|
|