Enable PromoResourceServiceTest

Enable the PromoResourceService tests on Android testbots and
make sure they don't fail due to incorrectly set time on the testbot devices.

BUG=139642
TEST=unit_tests

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152204 0039d316-1c4b-4281-b951-d872f2087c98

build/android/gtest_filter/unit_tests_disabled

@@ -133,9 +133,6 @@ ImageOperations.ResizeShouldAverageColors
 PrerenderTest.*
 RenderWidgetTest.OnMsgPaintAtSize
 
-# crbug.com/139642
-PromoResourceServiceTest.NotificationPromoTest
-
 # crbug.com/139643
 ExperimentsHelperTest.DisableAfterInitialization
 ExperimentsHelperTest.AssociateGoogleVariationID

chrome/browser/web_resource/promo_resource_service_unittest.cc

@@ -464,7 +464,7 @@ TEST_F(PromoResourceServiceTest, NotificationPromoTest) {
       "      \"date\":"
       "        ["
       "          {"
-      "            \"start\":\"15 Jan 2012 10:50:85 PST\","
+      "            \"start\":\"3 Aug 1999 9:26:06 GMT\","
       "            \"end\":\"7 Jan 2013 5:40:75 PST\""
       "          }"
       "        ],"
@@ -504,8 +504,11 @@ TEST_F(PromoResourceServiceTest, NotificationPromoTest) {
       "Like Chrome? Go http://www.google.com/chrome/",
       "It\'s simple. Go http://www.google.com/chrome/",
       "ACTION_EMAIL", "This is the body.", "XXX value",
-      1326653485,  // unix epoch for 15 Jan 2012 10:50:85 PST.
-      1357566075,  // unix epoch for 7 Jan 2013 5:40:75 PST.
+      // We hardcode the unix epoch time to make sure our parsing works.
+      // The starting date is in 1999 to make tests pass on Android devices
+      // with incorrect or unset date/time.
+      933672366,  // unix epoch for 3 Aug 1999 9:26:06 GMT.
+      1357566075, // unix epoch for 7 Jan 2013 5:40:75 PST.
       1000, 200, 100, 3600, 400, 30, false);
 #endif  // !defined(OS_ANDROID)