summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi/time_conversion_unittest.cc
diff options
context:
space:
mode:
authordpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 20:37:05 +0000
committerdpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 20:37:05 +0000
commit9fe54271af63f78cf3149b552980f244fe78eb4f (patch)
treea8ba44837b578728b9cd0b06bd7a150503a00395 /webkit/plugins/ppapi/time_conversion_unittest.cc
parentb3dab4a02b3c7d413838eda0ddaa8a5acc1d374f (diff)
downloadchromium_src-9fe54271af63f78cf3149b552980f244fe78eb4f.zip
chromium_src-9fe54271af63f78cf3149b552980f244fe78eb4f.tar.gz
chromium_src-9fe54271af63f78cf3149b552980f244fe78eb4f.tar.bz2
[flaky fixlet] Reenabling TimeConversion.Time for Linux
BUG=88971 TEST=NONE Review URL: https://chromiumcodereview.appspot.com/9395062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/time_conversion_unittest.cc')
-rw-r--r--webkit/plugins/ppapi/time_conversion_unittest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/webkit/plugins/ppapi/time_conversion_unittest.cc b/webkit/plugins/ppapi/time_conversion_unittest.cc
index d94dd22..5cc4091 100644
--- a/webkit/plugins/ppapi/time_conversion_unittest.cc
+++ b/webkit/plugins/ppapi/time_conversion_unittest.cc
@@ -20,13 +20,7 @@ static const double kTimeSecondsSlop =
static_cast<double>(kTimeInternalValueSlop) /
base::Time::kMicrosecondsPerSecond;
-// Fails on linux. http://crbug.com/88971
-#if defined(OS_LINUX)
-#define MAYBE_Time FAILS_Time
-#else
-#define MAYBE_Time Time
-#endif
-TEST(TimeConversion, MAYBE_Time) {
+TEST(TimeConversion, Time) {
// Should be able to round-trip.
base::Time now = base::Time::Now();
base::Time converted = ppapi::PPTimeToTime(TimeToPPTime(now));