Add support to download web store promo logos over https.

chrome/browser/extensions/apps_promo_unittest.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 "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 90 matching lines @@
                                              &promo_just_expired));
 
   // We should be able to disable the web store as well.
   AppsPromo::SetWebStoreSupportedForLocale(false);
   EXPECT_FALSE(AppsPromo::IsPromoSupportedForLocale());
   EXPECT_FALSE(apps_promo()->ShouldShowAppLauncher(installed_ids));
   EXPECT_FALSE(apps_promo()->ShouldShowPromo(installed_ids,
                                              &promo_just_expired));
 
   // Once the promo is set, we show both the promo and app launcher.
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      kPromoUserGroup);
+  AppsPromo::PromoData promo_data(kPromoId, kPromoHeader, kPromoButton,
+                                  GURL(kPromoLink), kPromoExpire, GURL(""),
+                                  kPromoUserGroup);
+  AppsPromo::SetPromo(promo_data);
   AppsPromo::SetWebStoreSupportedForLocale(true);
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
   EXPECT_TRUE(apps_promo()->ShouldShowAppLauncher(installed_ids));
   EXPECT_TRUE(apps_promo()->ShouldShowPromo(installed_ids,
                                             &promo_just_expired));
   EXPECT_FALSE(promo_just_expired);
 
   // Now install an app and the promo should not be shown.
   installed_ids.insert(*(default_app_ids.begin()));
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
@@ skipping 17 matching lines @@
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
   EXPECT_TRUE(apps_promo()->ShouldShowAppLauncher(installed_ids));
   EXPECT_TRUE(apps_promo()->ShouldShowPromo(installed_ids,
                                             &promo_just_expired));
   EXPECT_FALSE(promo_just_expired);
 }
 
 // Tests get and set of promo content.
 TEST_F(ExtensionAppsPromo, PromoPrefs) {
   // Store a promo....
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      kPromoUserGroup);
+  AppsPromo::PromoData promo_data(kPromoId, kPromoHeader, kPromoButton,
+                                  GURL(kPromoLink), kPromoExpire, GURL(""),
+                                  kPromoUserGroup);
+  AppsPromo::SetPromo(promo_data);
 
   // ... then make sure AppsPromo can access it.
-  EXPECT_EQ(kPromoId, AppsPromo::GetPromoId());
-  EXPECT_EQ(kPromoHeader, AppsPromo::GetPromoHeaderText());
-  EXPECT_EQ(kPromoButton, AppsPromo::GetPromoButtonText());
-  EXPECT_EQ(GURL(kPromoLink), AppsPromo::GetPromoLink());
-  EXPECT_EQ(kPromoExpire, AppsPromo::GetPromoExpireText());
-  EXPECT_EQ(kPromoUserGroup, AppsPromo::GetPromoUserGroup());
+  AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
+  EXPECT_EQ(kPromoId, actual_data.id);
+  EXPECT_EQ(kPromoHeader, actual_data.header);
+  EXPECT_EQ(kPromoButton, actual_data.button);
+  EXPECT_EQ(GURL(kPromoLink), actual_data.link);
+  EXPECT_EQ(kPromoExpire, actual_data.expire);
+  EXPECT_EQ(kPromoUserGroup, actual_data.user_group);
   // The promo logo should be the default value.
-  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromoLogo());
+  EXPECT_EQ(GURL(kPromoLogo), actual_data.logo);
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
 
   AppsPromo::ClearPromo();
-  EXPECT_EQ("", AppsPromo::GetPromoId());
-  EXPECT_EQ("", AppsPromo::GetPromoHeaderText());
-  EXPECT_EQ("", AppsPromo::GetPromoButtonText());
-  EXPECT_EQ(GURL(""), AppsPromo::GetPromoLink());
-  EXPECT_EQ("", AppsPromo::GetPromoExpireText());
-  EXPECT_EQ(AppsPromo::USERS_NONE, AppsPromo::GetPromoUserGroup());
-  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromoLogo());
+  actual_data = AppsPromo::GetPromo();
+  EXPECT_EQ("", actual_data.id);
+  EXPECT_EQ("", actual_data.header);
+  EXPECT_EQ("", actual_data.button);
+  EXPECT_EQ(GURL(""), actual_data.link);
+  EXPECT_EQ("", actual_data.expire);
+  EXPECT_EQ(AppsPromo::USERS_NONE, actual_data.user_group);
+  EXPECT_EQ(GURL(kPromoLogo), actual_data.logo);
   EXPECT_FALSE(AppsPromo::IsPromoSupportedForLocale());
 
   // Make sure we can set the logo to something other than the default.
   std::string promo_logo = "data:image/png;base64,iVBORw0kGgoAAAN";
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(promo_logo),
-                      kPromoUserGroup);
-  EXPECT_EQ(GURL(promo_logo), AppsPromo::GetPromoLogo());
+  promo_data.logo = GURL(promo_logo);
+  AppsPromo::SetPromo(promo_data);
+  EXPECT_EQ(GURL(promo_logo), AppsPromo::GetPromo().logo);
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
 
-  // Verify that the default is returned instead of http or https URLs.
-  promo_logo = "http://google.com/logo.png";
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(promo_logo),
-                      kPromoUserGroup);
-  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromoLogo());
+  // Verify that the default is returned instead of HTTP or HTTPS URLs.
+  promo_data.logo = GURL("http://google.com/logo.png");
+  AppsPromo::SetPromo(promo_data);
+  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromo().logo);
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
 
-  promo_logo = "https://google.com/logo.png";
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(promo_logo),
-                      kPromoUserGroup);
-  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromoLogo());
+  promo_data.logo = GURL("https://google.com/logo.png");
+  AppsPromo::SetPromo(promo_data);
+  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromo().logo);
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
 
   // Try an invalid URL.
-  promo_logo = "sldkfjlsdn";
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(promo_logo),
-                      kPromoUserGroup);
-  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromoLogo());
+  promo_data.logo = GURL("sldkfjlsdn");
+  AppsPromo::SetPromo(promo_data);
+  EXPECT_EQ(GURL(kPromoLogo), AppsPromo::GetPromo().logo);
   EXPECT_TRUE(AppsPromo::IsPromoSupportedForLocale());
 
   // Try the web store supported flag.
   EXPECT_FALSE(AppsPromo::IsWebStoreSupportedForLocale());
   AppsPromo::SetWebStoreSupportedForLocale(true);
   EXPECT_TRUE(AppsPromo::IsWebStoreSupportedForLocale());
   AppsPromo::SetWebStoreSupportedForLocale(false);
   EXPECT_FALSE(AppsPromo::IsWebStoreSupportedForLocale());
+
+  // Try setting and getting the source logo URL.
+  GURL expected_source("https://www.google.com/images/test.png");
+  AppsPromo::SetSourcePromoLogoURL(expected_source);
+  EXPECT_EQ(expected_source, AppsPromo::GetSourcePromoLogoURL());
 }
 
 // Tests maximizing the promo for USERS_NONE.
 TEST_F(ExtensionAppsPromo, UpdatePromoFocus_UsersNone) {
   // Verify that the apps section is not already maximized.
   ExpectAppsSectionMaximized(prefs(), false);
 
   // The promo shouldn't maximize for anyone.
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NONE);
+  AppsPromo::PromoData promo_data(kPromoId, kPromoHeader, kPromoButton,
+                                  GURL(kPromoLink), kPromoExpire, GURL(""),
+                                  AppsPromo::USERS_NONE);
+  AppsPromo::SetPromo(promo_data);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), false);
 
   // The promo still shouldn't maximize if we change it's ID.
-  AppsPromo::SetPromo("lkksdf", kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NONE);
+  promo_data.id = "lkksdf";
+  AppsPromo::SetPromo(promo_data);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), false);
 }
 
 // Tests maximizing the promo for USERS_EXISTING.
 TEST_F(ExtensionAppsPromo, UpdatePromoFocus_UsersExisting) {
   // Verify that the apps section is not already maximized.
   ExpectAppsSectionMaximized(prefs(), false);
 
   // Set the promo content.
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_EXISTING);
-
+  AppsPromo::PromoData promo_data(kPromoId, kPromoHeader, kPromoButton,
+                                  GURL(kPromoLink), kPromoExpire, GURL(""),
+                                  AppsPromo::USERS_EXISTING);
+  AppsPromo::SetPromo(promo_data);
   // This is a new user so the apps section shouldn't maximize.
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), false);
 
-
   // Set a new promo and now it should maximize.
-  AppsPromo::SetPromo("lksdf", kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_EXISTING);
+  promo_data.id = "lksdf";
+  AppsPromo::SetPromo(promo_data);
 
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), true);
 
   apps_promo()->HidePromo();
   ExpectAppsPromoHidden(prefs());
 }
 
 // Tests maximizing the promo for USERS_NEW.
 TEST_F(ExtensionAppsPromo, UpdatePromoFocus_UsersNew) {
   // Verify that the apps section is not already maximized.
   ExpectAppsSectionMaximized(prefs(), false);
 
   // The promo should maximize for new users.
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NEW);
+  AppsPromo::PromoData promo_data(kPromoId, kPromoHeader, kPromoButton,
+                                  GURL(kPromoLink), kPromoExpire, GURL(""),
+                                  AppsPromo::USERS_NEW);
+  AppsPromo::SetPromo(promo_data);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), true);
 
   // Try hiding the promo.
   apps_promo()->HidePromo();
   ExpectAppsPromoHidden(prefs());
 
   // The same promo should not maximize twice.
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), false);
 
   // Another promo targetting new users should not maximize.
-  AppsPromo::SetPromo("lksdf", kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NEW);
+  promo_data.id = "lksdf";
+  AppsPromo::SetPromo(promo_data);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), false);
 }
 
 // Tests maximizing the promo for USERS_NEW | USERS_EXISTING.
 TEST_F(ExtensionAppsPromo, UpdatePromoFocus_UsersAll) {
   // Verify that the apps section is not already maximized.
   ExpectAppsSectionMaximized(prefs(), false);
 
   // The apps section should maximize for all users.
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NEW | AppsPromo::USERS_EXISTING);
+  AppsPromo::PromoData promo_data(
+      kPromoId, kPromoHeader, kPromoButton, GURL(kPromoLink), kPromoExpire,
+      GURL(""), AppsPromo::USERS_NEW | AppsPromo::USERS_EXISTING);
+  AppsPromo::SetPromo(promo_data);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), true);
 
   apps_promo()->HidePromo();
   ExpectAppsPromoHidden(prefs());
 
   // The same promo should not maximize twice.
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), false);
 
   // A promo with a new ID should maximize though.
-  AppsPromo::SetPromo("lkksdf", kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NEW | AppsPromo::USERS_EXISTING);
+  promo_data.id = "lkksdf";
+  AppsPromo::SetPromo(promo_data);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), true);
 }
 
 TEST_F(ExtensionAppsPromo, PromoHiddenByPref) {
   prefs()->SetInteger(prefs::kAppsPromoCounter, 0);
   prefs()->SetBoolean(prefs::kDefaultAppsInstalled, true);
 
   // When the "hide" pref is false, the promo should still appear.
   prefs()->SetBoolean(prefs::kNTPHideWebStorePromo, false);
-  AppsPromo::SetPromo(kPromoId, kPromoHeader, kPromoButton,
-                      GURL(kPromoLink), kPromoExpire, GURL(""),
-                      AppsPromo::USERS_NEW | AppsPromo::USERS_EXISTING);
+  AppsPromo::PromoData promo_data(
+      kPromoId, kPromoHeader, kPromoButton, GURL(kPromoLink), kPromoExpire,
+      GURL(""), AppsPromo::USERS_NEW | AppsPromo::USERS_EXISTING);
+  AppsPromo::SetPromo(promo_data);
   bool just_expired;
   bool show_promo = apps_promo()->ShouldShowPromo(
       apps_promo()->old_default_apps(), &just_expired);
   EXPECT_TRUE(show_promo);
 
   // When the "hide" pref is true, the promo should NOT appear.
   prefs()->SetBoolean(prefs::kNTPHideWebStorePromo, true);
   show_promo = apps_promo()->ShouldShowPromo(
       apps_promo()->old_default_apps(), &just_expired);
   EXPECT_FALSE(show_promo);
 }
 
 #endif // OS_CHROMEOS