Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3199)

Unified Diff: chrome/browser/extensions/apps_promo_unittest.cc

Issue 8438028: ntp: remove ShownSectionHandler and all references to it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more functional test updates Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/apps_promo.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/apps_promo_unittest.cc
diff --git a/chrome/browser/extensions/apps_promo_unittest.cc b/chrome/browser/extensions/apps_promo_unittest.cc
index 77d40ea02fccc80d5b7d6432f84d679e427ded6e..e06f1dc03bb1e0b24105536cc909fec40934c835 100644
--- a/chrome/browser/extensions/apps_promo_unittest.cc
+++ b/chrome/browser/extensions/apps_promo_unittest.cc
@@ -6,7 +6,6 @@
#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"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -25,22 +24,6 @@ const char kPromoExpire[] = "No thanks.";
const int kPromoUserGroup =
AppsPromo::USERS_NEW | AppsPromo::USERS_EXISTING;
-void ExpectAppsSectionMaximized(PrefService* prefs, bool maximized) {
- 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 testing::Test {
@@ -214,106 +197,6 @@ TEST_F(ExtensionAppsPromo, PromoPrefs) {
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::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.
- 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::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.
- 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::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.
- 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::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.
- 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);
« no previous file with comments | « chrome/browser/extensions/apps_promo.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698