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

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

Issue 11826028: Add a method to read the Omaha experiment_labels value. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix value Created 7 years, 11 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 4e1fba28e01da40d4eee01de780b0ea92938fc30..f00dd04ee1e83b8f0a0b19eb9dfb1baf17e952f2 100644
--- a/chrome/installer/util/google_update_settings_unittest.cc
+++ b/chrome/installer/util/google_update_settings_unittest.cc
@@ -119,6 +119,7 @@ class GoogleUpdateSettingsTest : public testing::Test {
BrowserDistribution* chrome =
BrowserDistribution::GetSpecificDistribution(
BrowserDistribution::CHROME_BROWSER);
+ std::wstring value;
#if defined(GOOGLE_CHROME_BUILD)
EXPECT_TRUE(chrome->ShouldSetExperimentLabels());
@@ -127,7 +128,6 @@ class GoogleUpdateSettingsTest : public testing::Test {
// Validate that something is written. Only worry about the label itself.
RegKey key;
- std::wstring value;
HKEY root = install == SYSTEM_INSTALL ?
HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
string16 state_key = install == SYSTEM_INSTALL ?
@@ -138,6 +138,9 @@ class GoogleUpdateSettingsTest : public testing::Test {
EXPECT_EQ(ERROR_SUCCESS,
key.ReadValue(google_update::kExperimentLabels, &value));
EXPECT_EQ(kTestExperimentLabel, value);
+ EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
+ install == SYSTEM_INSTALL, &value));
+ EXPECT_EQ(kTestExperimentLabel, value);
key.Close();
// Now that the label is set, test the delete functionality. An empty label
@@ -148,9 +151,13 @@ class GoogleUpdateSettingsTest : public testing::Test {
key.Open(root, state_key.c_str(), KEY_QUERY_VALUE));
EXPECT_EQ(ERROR_FILE_NOT_FOUND,
key.ReadValue(google_update::kExperimentLabels, &value));
+ EXPECT_FALSE(GoogleUpdateSettings::ReadExperimentLabels(
+ install == SYSTEM_INSTALL, &value));
key.Close();
#else
EXPECT_FALSE(chrome->ShouldSetExperimentLabels());
+ EXPECT_FALSE(GoogleUpdateSettings::ReadExperimentLabels(
+ install == SYSTEM_INSTALL, &value));
#endif // GOOGLE_CHROME_BUILD
}
« 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