Remove debug code that accidentally got committed with promo_service changes.

chrome/browser/web_resource/promo_resource_service.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 "chrome/browser/web_resource/promo_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 // Delay on first fetch so we don't interfere with startup.
 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).
 static const int kPromoServiceVersion = 7;
 
 // The number of groups sign-in promo users will be divided into (which gives us
 // a 1/N granularity when targeting more groups).
 static const int kNTPSignInPromoNumberOfGroups = 100;
 
 // Properties used by the server.
 static const char kAnswerIdProperty[] = "answer_id";
 static const char kWebStoreHeaderProperty[] = "question";
 static const char kWebStoreButtonProperty[] = "inproduct_target";
 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() {
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kPromoServerURL);
 }
 
 int GetCacheUpdateDelay() {
   return IsTest() ? kTestCacheUpdateDelay : kCacheUpdateDelay;
 }
 
@@ skipping 55 matching lines @@
     default:
       // Show promos for local builds when using a custom promo URL.
       return CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPromoServerURL);
   }
 }
 
 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,
                          GetCacheUpdateDelay()),
                          profile_(profile),
                          channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
   Init();
 }
 
 PromoResourceService::~PromoResourceService() { }
@@ skipping 312 matching lines @@
   if (!prefs->HasPrefPath(prefs::kNTPSignInPromoGroup)) {
     prefs->SetInteger(prefs::kNTPSignInPromoGroup,
                       base::RandInt(1, kNTPSignInPromoNumberOfGroups));
   }
 
   // A response is not kept if the build wasn't targeted, so the only thing
   // required to check is the group this client has been tagged in.
   return prefs->GetInteger(prefs::kNTPSignInPromoGroupMax) >=
          prefs->GetInteger(prefs::kNTPSignInPromoGroup);
 }