Add support to download web store promo logos over https.

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/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
@@ skipping 298 matching lines @@
   }
 }
 
 void PromoResourceService::UnpackWebStoreSignal(
     const DictionaryValue& parsed_json) {
   DictionaryValue* topic_dict;
   ListValue* answer_list;
 
   bool is_webstore_active = false;
   bool signal_found = false;
-  std::string promo_id = "";
-  std::string promo_header = "";
-  std::string promo_button = "";
+  AppsPromo::PromoData promo_data;
   std::string promo_link = "";
-  std::string promo_expire = "";
   std::string promo_logo = "";
-  int maximize_setting = 0;
   int target_builds = 0;
 
   if (!parsed_json.GetDictionary("topic", &topic_dict) ||
       !topic_dict->GetList("answers", &answer_list))
     return;
 
   for (ListValue::const_iterator answer_iter = answer_list->begin();
        answer_iter != answer_list->end(); ++answer_iter) {
     if (!(*answer_iter)->IsType(Value::TYPE_DICTIONARY))
       continue;
@@ skipping 19 matching lines @@
     name = name.substr(split+1);
     split = name.find(':');
     if (split == std::string::npos ||
         !base::StringToInt(name.substr(0, split), &target_builds))
       continue;
 
     // (3) an integer specifying what users should maximize the promo
     name = name.substr(split+1);
     split = name.find(':');
     if (split == std::string::npos ||
-        !base::StringToInt(name.substr(0, split), &maximize_setting))
+        !base::StringToInt(name.substr(0, split), &promo_data.user_group))
       continue;
 
     // (4) optional text that specifies a URL of a logo image
     promo_logo = name.substr(split+1);
 
-    if (!a_dic->GetString(kAnswerIdProperty, &promo_id) ||
-        !a_dic->GetString(kWebStoreHeaderProperty, &promo_header) ||
-        !a_dic->GetString(kWebStoreButtonProperty, &promo_button) ||
+    if (!a_dic->GetString(kAnswerIdProperty, &promo_data.id) ||
+        !a_dic->GetString(kWebStoreHeaderProperty, &promo_data.header) ||
+        !a_dic->GetString(kWebStoreButtonProperty, &promo_data.button) ||
         !a_dic->GetString(kWebStoreLinkProperty, &promo_link) ||
-        !a_dic->GetString(kWebStoreExpireProperty, &promo_expire))
+        !a_dic->GetString(kWebStoreExpireProperty, &promo_data.expire))
       continue;
 
     if (IsThisBuildTargeted(target_builds)) {
-      // Store the first web store promo that targets the current build.
-      AppsPromo::SetPromo(promo_id, promo_header, promo_button,
-                          GURL(promo_link), promo_expire, GURL(promo_logo),
-                          maximize_setting);
+      // The downloader will set the promo prefs and send the
+      // NOTIFICATION_WEB_STORE_PROMO_LOADED notification.
+      promo_data.link = GURL(promo_link);
+      promo_data.logo = GURL(promo_logo);
+      apps_promo_logo_fetcher_.reset(
+          new AppsPromoLogoFetcher(profile_, promo_data));
       signal_found = true;
       break;
     }
   }
 
   if (!signal_found) {
     // If no web store promos target this build, then clear all the prefs.
     AppsPromo::ClearPromo();
   }
 
   AppsPromo::SetWebStoreSupportedForLocale(is_webstore_active);
 
-  NotificationService::current()->Notify(
-      chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED,
-      Source<Profile>(profile_),
-      NotificationService::NoDetails());
-
   return;
 }
 
 void PromoResourceService::UnpackLogoSignal(
     const DictionaryValue& parsed_json) {
   DictionaryValue* topic_dict;
   ListValue* answer_list;
   double old_logo_start = 0;
   double old_logo_end = 0;
   double logo_start = 0;
@@ skipping 76 matching lines @@
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
     is_promo_build = PromoResourceService::IsBuildTargeted(
         channel, prefs->GetInteger(prefs::kNTPPromoBuild));
   }
 
   return !promo_closed && !is_synced && is_promo_build;
 }
 
 }  // namespace PromoResourceServiceUtil