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

Unified Diff: chrome/installer/util/google_update_settings_unittest.cc

Issue 2919963002: Clean Read/SetExperimentLabels to remove check for Chrome build. (Closed)
Patch Set: Fix includes in chrome_variations_service_client.cc Created 3 years, 7 months 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/installer/util/google_update_settings.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_update_settings_unittest.cc
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc
index 00a8cbc24c78c2eb0b38000e02d5e4ed025b2f41..dcee57837a76ae6f51d7f8c228c6d5bba45f113b 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -39,9 +39,7 @@ namespace {
const wchar_t kTestProductGuid[] = L"{89F1B351-B15D-48D4-8F10-1298721CF13D}";
-#if defined(GOOGLE_CHROME_BUILD)
const wchar_t kTestExperimentLabel[] = L"test_label_value";
-#endif
// This test fixture redirects the HKLM and HKCU registry hives for
// the duration of the test to make it independent of the machine
@@ -71,7 +69,6 @@ class GoogleUpdateSettingsTest : public testing::Test {
install_static::ScopedInstallDetails details(install == SYSTEM_INSTALL);
base::string16 value;
-#if defined(GOOGLE_CHROME_BUILD)
// Before anything is set, ReadExperimentLabels should succeed but return
// an empty string.
EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
@@ -111,10 +108,6 @@ class GoogleUpdateSettingsTest : public testing::Test {
install == SYSTEM_INSTALL, &value));
EXPECT_EQ(base::string16(), value);
key.Close();
-#else
- EXPECT_FALSE(GoogleUpdateSettings::ReadExperimentLabels(
- install == SYSTEM_INSTALL, &value));
-#endif // GOOGLE_CHROME_BUILD
}
// Creates "ap" key with the value given as parameter. Also adds work
@@ -780,6 +773,8 @@ TEST_F(GoogleUpdateSettingsTest, UpdatesDisabledByTimeout) {
EXPECT_TRUE(GoogleUpdateSettings::AreAutoupdatesEnabled());
}
+#endif // defined(GOOGLE_CHROME_BUILD)
+
TEST_F(GoogleUpdateSettingsTest, ExperimentsLabelHelperSystem) {
TestExperimentsLabelHelper(SYSTEM_INSTALL);
}
@@ -788,8 +783,6 @@ TEST_F(GoogleUpdateSettingsTest, ExperimentsLabelHelperUser) {
TestExperimentsLabelHelper(USER_INSTALL);
}
-#endif // defined(GOOGLE_CHROME_BUILD)
-
TEST_F(GoogleUpdateSettingsTest, GetDownloadPreference) {
RegKey policy_key;
« no previous file with comments | « chrome/installer/util/google_update_settings.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698