summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 23:40:08 +0000
committerjstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 23:40:08 +0000
commit7354e0853ec3a3eeb899901049a4ce6ab749552b (patch)
treea78cd75de568bda429464c1122cbb895a3e7dce0
parentc558e2aaf33cda3250454cbd43e43bd1d589e3d0 (diff)
downloadchromium_src-7354e0853ec3a3eeb899901049a4ce6ab749552b.zip
chromium_src-7354e0853ec3a3eeb899901049a4ce6ab749552b.tar.gz
chromium_src-7354e0853ec3a3eeb899901049a4ce6ab749552b.tar.bz2
Don't run apps promo tests on chrome os
BUG=none TEST=none Review URL: http://codereview.chromium.org/4884003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66020 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/default_apps_unittest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc
index 24a9d70..381e679 100644
--- a/chrome/browser/extensions/default_apps_unittest.cc
+++ b/chrome/browser/extensions/default_apps_unittest.cc
@@ -7,7 +7,8 @@
#include "chrome/test/testing_pref_service.h"
#include "testing/gtest/include/gtest/gtest.h"
-// TODO(dpolukhin): On Chrome OS all apps are installed via external extensions
+// 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(DefaultApps, Basics) {
TestingPrefService pref_service;
@@ -61,7 +62,6 @@ TEST(DefaultApps, Basics) {
EXPECT_FALSE(default_apps.ShouldShowPromo(default_app_ids));
EXPECT_EQ(DefaultApps::kAppsPromoCounterMax, default_apps.GetPromoCounter());
}
-#endif // OS_CHROMEOS
TEST(DefaultApps, HidePromo) {
TestingPrefService pref_service;
@@ -100,8 +100,6 @@ TEST(DefaultApps, InstallingAnAppHidesPromo) {
EXPECT_EQ(DefaultApps::kAppsPromoCounterMax, default_apps.GetPromoCounter());
}
-// TODO(dpolukhin): On Chrome OS all apps are installed via external extensions
-#if !defined(OS_CHROMEOS)
TEST(DefaultApps, ManualAppInstalledWhileInstallingDefaultApps) {
// It is possible to have apps manually installed while the default apps are
// being installed. The network or server might be down, causing the default