Add a policy to allow NTP promotions & default apps to be disabled.

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/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"
 #include "chrome/common/pref_names.h"
@@ skipping 17 matching lines @@
   EXPECT_EQ(maximized,
             (ShownSectionsHandler::GetShownSections(prefs) & APPS) != 0);
   EXPECT_EQ(!maximized,
             (ShownSectionsHandler::GetShownSections(prefs) & THUMB) != 0);
 }
 
 void ExpectAppsPromoHidden(PrefService* prefs) {
   // Hiding the promo places the apps section in menu mode and maximizes the
   // most visited section.
   EXPECT_TRUE((ShownSectionsHandler::GetShownSections(prefs) &
+               APPS) == 0);
+  EXPECT_TRUE((ShownSectionsHandler::GetShownSections(prefs) &
                (MENU_APPS | THUMB)) != 0);
 }
 
 } // namespace
 
 class ExtensionAppsPromo : public TestingBrowserProcessTest {
  public:
   TestingPrefService* prefs() { return &prefs_; }
   AppsPromo* apps_promo() { return &apps_promo_; }
 
@@ skipping 14 matching lines @@
       apps_promo_(&prefs_) {
 }
 
 void ExtensionAppsPromo::SetUp() {
   browser::RegisterUserPrefs(&prefs_);
 }
 
 // TODO(dpolukhin): On Chrome OS all apps are installed via external extensions,
 // and the web store promo is never shown.
 #if !defined(OS_CHROMEOS)
+
 TEST_F(ExtensionAppsPromo, HappyPath) {
   const ExtensionIdSet& default_app_ids = apps_promo()->old_default_apps();
 
   EXPECT_GT(default_app_ids.size(), 0u);
 
   // The promo counter should default to the max, since we only use the counter
   // if they were installed from older versions of Chrome.
   EXPECT_EQ(AppsPromo::kDefaultAppsCounterMax + 1,
             apps_promo()->GetPromoCounter());
 
@@ skipping 221 matching lines @@
   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);
   apps_promo()->MaximizeAppsIfNecessary();
   ExpectAppsSectionMaximized(prefs(), true);
 }
 
-#endif  // OS_CHROMEOS
+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);
+  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