promo_resource_service fixes/cleanup for promos.

chrome/browser/web_resource/promo_resource_service_unittest.cc

Index: chrome/browser/web_resource/promo_resource_service_unittest.cc
===================================================================
--- chrome/browser/web_resource/promo_resource_service_unittest.cc	(revision 97719)
+++ chrome/browser/web_resource/promo_resource_service_unittest.cc	(working copy)
@@ -116,7 +116,7 @@
                      "    \"answers\": ["
                      "       {"
                      "        \"name\": \"promo_start\","
-                     "        \"question\": \"3:2\","
+                     "        \"question\": \"3:2:5\","
                      "        \"tooltip\": \"Eat more pie!\","
                      "        \"inproduct\": \"31/01/10 01:00 GMT\""
                      "       },"
@@ -143,7 +143,7 @@
 
   int promo_group = prefs->GetInteger(prefs::kNTPPromoGroup);
   EXPECT_GE(promo_group, 0);
-  EXPECT_LT(promo_group, 16);
+  EXPECT_LT(promo_group, 100);
 
   int promo_build_type = prefs->GetInteger(prefs::kNTPPromoBuild);
   EXPECT_EQ(promo_build_type & PromoResourceService::DEV_BUILD,
@@ -155,6 +155,9 @@
   int promo_time_slice = prefs->GetInteger(prefs::kNTPPromoGroupTimeSlice);
   EXPECT_EQ(promo_time_slice, 2);
 
+  int max_group = prefs->GetInteger(prefs::kNTPPromoGroupMax);
+  EXPECT_EQ(max_group, 5);
+
   double promo_start =
       prefs->GetDouble(prefs::kNTPPromoStart);
   int64 actual_start = 1264899600 +  // unix epoch for Jan 31 2010 0100 GMT.