Remove debug code that accidentally got committed with promo_service changes.

BUG=chromium-os:24158
TEST=NONE

Review URL: http://codereview.chromium.org/8931005

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

chrome/browser/web_resource/promo_resource_service.cc

@@ -30,8 +30,8 @@ namespace {
 static const int kStartResourceFetchDelay = 5000;
 
 // Delay between calls to update the cache (48 hours), and 3 min in debug mode.
-static const int kCacheUpdateDelay = 1 * 60 * 1000;
-static const int kTestCacheUpdateDelay = 1 * 60 * 1000;
+static const int kCacheUpdateDelay = 48 * 60 * 60 * 1000;
+static const int kTestCacheUpdateDelay = 3 * 60 * 1000;
 
 // The version of the service (used to expire the cache when upgrading Chrome
 // to versions with different types of promos).
@@ -49,14 +49,11 @@ static const char kWebStoreLinkProperty[] = "inproduct";
 static const char kWebStoreExpireProperty[] = "tooltip";
 
 const char* GetPromoResourceURL() {
-const char* kCaitPromoResourceServer =
-    "http://caitkp-desktop.mon.corp.google.com/promo.js?";
   std::string promo_server_url = CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kPromoServerURL);
   return promo_server_url.empty() ?
       PromoResourceService::kDefaultPromoResourceServer :
-      kCaitPromoResourceServer;
-      //promo_server_url.c_str();
+      promo_server_url.c_str();
 }
 
 bool IsTest() {
@@ -132,7 +129,7 @@ bool PromoResourceService::IsBuildTargeted(chrome::VersionInfo::Channel channel,
 PromoResourceService::PromoResourceService(Profile* profile)
     : WebResourceService(profile->GetPrefs(),
                          GetPromoResourceURL(),
-                         false,//true,  // append locale to URL
+                         true,  // append locale to URL
                          chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                          prefs::kNTPPromoResourceCacheUpdate,
                          kStartResourceFetchDelay,