Add support to download web store promo logos over https.

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 AppsPromoLogoFetcher;
+class PrefService;
 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);
 
   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, UnpackLogoSignal);
   FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, UnpackPromoSignal);
   FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, UnpackWebStoreSignal);
   FRIEND_TEST_ALL_PREFIXES(
       PromoResourceServiceTest, UnpackPartialWebStoreSignal);
+  FRIEND_TEST_ALL_PREFIXES(
+      PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogo);
+  FRIEND_TEST_ALL_PREFIXES(
+      PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogoError);
+  FRIEND_TEST_ALL_PREFIXES(
+      PromoResourceServiceTest, UnpackWebStoreSignalHttpLogo);
+
 
   // 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,
   };
 
@@ skipping 96 matching lines @@
   // }
   //
   void UnpackLogoSignal(const base::DictionaryValue& parsed_json);
 
   // Unpack the web store promo. Expects JSON delivery in the following format:
   // {
   //   "topic": {
   //     "answers": [
   //       {
   //         "answer_id": "1143011",
-  //         "name": "webstore_promo:15:",
+  //         "name": "webstore_promo:15:1:https://www.google.com/logo.png",
   //         "question": "Browse thousands of apps and games for Chrome.",
   //         "inproduct_target": "Visit the Chrome Web Store",
   //         "inproduct": "https://chrome.google.com/webstore?hl=en",
   //         "tooltip": "No thanks, hide this"
   //       },
   //       ...
   //     ]
   //   }
   // }
   // The properties are defined as follows:
   //   inproduct: the release channels targeted (bitwise or of BuildTypes)
   //   question: the promo header text
   //   inproduct_target: the promo button text
   //   inproduct: the promo button link
   //   tooltip: the text for the "hide this" link on the promo
-  //   name: starts with "webstore_promo" to identify the signal. the second
+  //   name: starts with "webstore_promo" to identify the signal. The second
   //         part contains the release channels targeted (bitwise or of
-  //         BuildTypes). The third part is optional and specifies the URL of
-  //         the logo image. In the example above, the URL is empty so the
-  //         default webstore logo will be used.
+  //         BuildTypes). The third part specifies what users should maximize
+  //         the apps section of the NTP when first loading the promo (bitwise
+  //         or of AppsPromo::UserGroup). The forth part is optional and
+  //         specifies the URL of the logo image. If left out, the default
+  //         webstore logo will be used. The logo can be an HTTPS or DATA URL.
   //   answer_id: the promo's id
   void UnpackWebStoreSignal(const base::DictionaryValue& parsed_json);
 
   // The profile this service belongs to.
   Profile* profile_;
 
   // Gets mutable dictionary attached to user's preferences, so that we
   // 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_;
 
+  // A helper that downloads the promo logo.
+  scoped_ptr<AppsPromoLogoFetcher> apps_promo_logo_fetcher_;
+
   DISALLOW_COPY_AND_ASSIGN(PromoResourceService);
 };
 
 #endif  // CHROME_BROWSER_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_