promo_resource_service fixes/cleanup for promos.

chrome/browser/web_resource/promo_resource_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_
 #define CHROME_BROWSER_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_
 #pragma once
 
 #include <string>
 
 #include "chrome/browser/web_resource/web_resource_service.h"
 #include "chrome/common/chrome_version_info.h"
 
 class Profile;
-
-namespace PromoResourceServiceUtil {
-
-// Certain promotions should only be shown to certain classes of users. This
-// function will change to reflect each kind of promotion.
-bool CanShowPromo(Profile* profile);
-
-}  // namespace PromoResourceServiceUtil
-
 class PrefService;
 
 // A PromoResourceService fetches data from a web resource server to be used to
 // dynamically change the appearance of the New Tab Page. For example, it has
 // been used to fetch "tips" to be displayed on the NTP, or to display
 // promotional messages to certain groups of Chrome users.
 //
 // TODO(mirandac): Arrange for a server to be set up specifically for promo
 // messages, which have until now been piggybacked onto the old tips server
 // structure. (see http://crbug.com/70634 for details.)
 class PromoResourceService
     : public WebResourceService {
  public:
-  static bool IsBuildTargeted(chrome::VersionInfo::Channel channel,
-                              int builds_targeted);
+  // Checks for conditions to show promo: start/end times, channel, etc.
+  static bool CanShowPromo(Profile* profile);
 
   static void RegisterPrefs(PrefService* local_state);
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   explicit PromoResourceService(Profile* profile);
 
   // Default server of dynamically loaded NTP HTML elements.
   static const char* kDefaultPromoResourceServer;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, IsBuildTargeted);
   FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, UnpackLogoSignal);
   FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, UnpackPromoSignal);
   FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, UnpackWebStoreSignal);
   FRIEND_TEST_ALL_PREFIXES(
       PromoResourceServiceTest, UnpackPartialWebStoreSignal);
 
   // Identifies types of Chrome builds for promo targeting.
   enum BuildType {
     NO_BUILD = 0,
     DEV_BUILD = 1,
     BETA_BUILD = 1 << 1,
     STABLE_BUILD = 1 << 2,
     CANARY_BUILD = 1 << 3,
   };
 
   virtual ~PromoResourceService();
 
   int GetPromoServiceVersion();
 
   // Gets the locale of the last promos fetched from the server. This is saved
   // so we can fetch new data if the locale changes.
   std::string GetPromoLocale();
 
   void Init();
 
+  static bool IsBuildTargeted(chrome::VersionInfo::Channel channel,
+                              int builds_targeted);
+
   // Returns true if |builds_targeted| includes the release channel Chrome
   // belongs to. For testing purposes, you can override the current channel
   // with set_channel.
   bool IsThisBuildTargeted(int builds_targeted);
 
   // Schedule a notification that a web resource is either going to become
   // available or be no longer valid.
   void ScheduleNotification(double ms_start_time, double ms_end_time);
 
   // Schedules the initial notification for when the web resource is going
@@ skipping 111 matching lines @@
   // can write resource data back to user's pref file.
   base::DictionaryValue* web_resource_cache_;
 
   // Overrides the current Chrome release channel for testing purposes.
   chrome::VersionInfo::Channel channel_;
 
   DISALLOW_COPY_AND_ASSIGN(PromoResourceService);
 };
 
 #endif  // CHROME_BROWSER_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_