From 843585a121e944b4c20a95e8315396f6a3f022b5 Mon Sep 17 00:00:00 2001
From: "qtc746@motorola.com"
 <qtc746@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 5 Oct 2012 14:27:33 +0000
Subject: Enable GpuMemoryManagerTest.StubMemoryStatsForLastManageTests on
 Android.

GpuMemoryManagerTest.StubMemoryStatsForLastManageTests was failing in Android,
and disabled in revision 147576. Failed test was fixed in 147695 and hence it
is safe re-enable it now.


Review URL: https://chromiumcodereview.appspot.com/11028031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160366 0039d316-1c4b-4281-b951-d872f2087c98
---
 AUTHORS                                               | 2 +-
 build/android/gtest_filter/content_unittests_disabled | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 5b5b93b..1e48cde 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -136,7 +136,7 @@ Vinay Anantharaman <vinaya@adobe.com>
 Naveen Bobbili <naveenbobbili@motorola.com>
 Vamshikrishna Yellenki <vamshi@motorola.com>
 Robert Nagy <robert.nagy@gmail.com>
-Nayan Kumar K <nayankk@motorola.com>
+Nayan Kumar K <qtc746@motorola.com>
 ShankarGanesh K <blr.bmlab@gmail.com>
 Goutham Jagannatha <wrm364@motorola.com>
 Rosen Dash <rosen.dash@gmail.com>
diff --git a/build/android/gtest_filter/content_unittests_disabled b/build/android/gtest_filter/content_unittests_disabled
index c2eea6c..6ec30f1 100644
--- a/build/android/gtest_filter/content_unittests_disabled
+++ b/build/android/gtest_filter/content_unittests_disabled
@@ -12,8 +12,6 @@ AudioRendererHostTest.SimulateErrorAndClose
 # crbug.com/104950
 DeviceOrientationProviderTest.ObserverNotRemoved
 DeviceOrientationProviderTest.StartFailing
-# crbug.com/138138
-GpuMemoryManagerTest.StubMemoryStatsForLastManageTests
 # crbug.com/138930
 SkCanvasVideoRendererTest.*
 # crbug.com/139095
-- 
cgit v1.1