promo_resource_service fixes/cleanup for promos.

chrome/browser/web_resource/promo_resource_service_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/json/json_reader.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 98 matching lines @@
 }
 
 TEST_F(PromoResourceServiceTest, UnpackPromoSignal) {
   // Set up start and end dates and promo line in a Dictionary as if parsed
   // from the service.
   std::string json = "{ "
                      "  \"topic\": {"
                      "    \"answers\": ["
                      "       {"
                      "        \"name\": \"promo_start\","
-                     "        \"question\": \"3:2\","
+                     "        \"question\": \"3:2:5\","
                      "        \"tooltip\": \"Eat more pie!\","
                      "        \"inproduct\": \"31/01/10 01:00 GMT\""
                      "       },"
                      "       {"
                      "        \"name\": \"promo_end\","
                      "        \"inproduct\": \"31/01/12 01:00 GMT\""
                      "       }"
                      "    ]"
                      "  }"
                      "}";
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
       base::JSONReader::Read(json, false)));
 
   // Initialize a message loop for this to run on.
   MessageLoop loop;
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackPromoSignal(*(test_json.get()));
   PrefService* prefs = profile_.GetPrefs();
   ASSERT_TRUE(prefs != NULL);
 
   std::string promo_line = prefs->GetString(prefs::kNTPPromoLine);
   EXPECT_EQ(promo_line, "Eat more pie!");
 
   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,
             PromoResourceService::DEV_BUILD);
   EXPECT_EQ(promo_build_type & PromoResourceService::BETA_BUILD,
             PromoResourceService::BETA_BUILD);
   EXPECT_EQ(promo_build_type & PromoResourceService::STABLE_BUILD, 0);
 
   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.
       promo_group * 2 * 60 * 60;
   EXPECT_EQ(promo_start, actual_start);
 
   double promo_end =
       prefs->GetDouble(prefs::kNTPPromoEnd);
   EXPECT_EQ(promo_end, 1327971600);  // unix epoch for Jan 31 2012 0100 GMT.
 }
@@ skipping 96 matching lines @@
   const chrome::VersionInfo::Channel stable =
       chrome::VersionInfo::CHANNEL_STABLE;
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 1));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 3));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 7));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 15));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 8));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 11));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 12));
 }